aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/hmac/hm_ameth.c
diff options
context:
space:
mode:
Diffstat (limited to 'openssl/crypto/hmac/hm_ameth.c')
-rw-r--r--openssl/crypto/hmac/hm_ameth.c157
1 files changed, 76 insertions, 81 deletions
diff --git a/openssl/crypto/hmac/hm_ameth.c b/openssl/crypto/hmac/hm_ameth.c
index e03f24aed..29b2b5dff 100644
--- a/openssl/crypto/hmac/hm_ameth.c
+++ b/openssl/crypto/hmac/hm_ameth.c
@@ -1,5 +1,6 @@
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 2007.
+/*
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2007.
*/
/* ====================================================================
* Copyright (c) 2007 The OpenSSL Project. All rights reserved.
@@ -9,7 +10,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
@@ -62,106 +63,100 @@
#define HMAC_TEST_PRIVATE_KEY_FORMAT
-/* HMAC "ASN1" method. This is just here to indicate the
- * maximum HMAC output length and to free up an HMAC
- * key.
+/*
+ * HMAC "ASN1" method. This is just here to indicate the maximum HMAC output
+ * length and to free up an HMAC key.
*/
static int hmac_size(const EVP_PKEY *pkey)
- {
- return EVP_MAX_MD_SIZE;
- }
+{
+ return EVP_MAX_MD_SIZE;
+}
static void hmac_key_free(EVP_PKEY *pkey)
- {
- ASN1_OCTET_STRING *os = (ASN1_OCTET_STRING *)pkey->pkey.ptr;
- if (os)
- {
- if (os->data)
- OPENSSL_cleanse(os->data, os->length);
- ASN1_OCTET_STRING_free(os);
- }
- }
-
+{
+ ASN1_OCTET_STRING *os = (ASN1_OCTET_STRING *)pkey->pkey.ptr;
+ if (os) {
+ if (os->data)
+ OPENSSL_cleanse(os->data, os->length);
+ ASN1_OCTET_STRING_free(os);
+ }
+}
static int hmac_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
- {
- switch (op)
- {
- case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
- *(int *)arg2 = NID_sha1;
- return 1;
-
- default:
- return -2;
- }
- }
+{
+ switch (op) {
+ case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
+ *(int *)arg2 = NID_sha256;
+ return 1;
+
+ default:
+ return -2;
+ }
+}
#ifdef HMAC_TEST_PRIVATE_KEY_FORMAT
-/* A bogus private key format for test purposes. This is simply the
- * HMAC key with "HMAC PRIVATE KEY" in the headers. When enabled the
- * genpkey utility can be used to "generate" HMAC keys.
+/*
+ * A bogus private key format for test purposes. This is simply the HMAC key
+ * with "HMAC PRIVATE KEY" in the headers. When enabled the genpkey utility
+ * can be used to "generate" HMAC keys.
*/
static int old_hmac_decode(EVP_PKEY *pkey,
- const unsigned char **pder, int derlen)
- {
- ASN1_OCTET_STRING *os;
- os = ASN1_OCTET_STRING_new();
- if (!os || !ASN1_OCTET_STRING_set(os, *pder, derlen))
- return 0;
- EVP_PKEY_assign(pkey, EVP_PKEY_HMAC, os);
- return 1;
- }
+ const unsigned char **pder, int derlen)
+{
+ ASN1_OCTET_STRING *os;
+ os = ASN1_OCTET_STRING_new();
+ if (!os || !ASN1_OCTET_STRING_set(os, *pder, derlen))
+ return 0;
+ EVP_PKEY_assign(pkey, EVP_PKEY_HMAC, os);
+ return 1;
+}
static int old_hmac_encode(const EVP_PKEY *pkey, unsigned char **pder)
- {
- int inc;
- ASN1_OCTET_STRING *os = (ASN1_OCTET_STRING *)pkey->pkey.ptr;
- if (pder)
- {
- if (!*pder)
- {
- *pder = OPENSSL_malloc(os->length);
- inc = 0;
- }
- else inc = 1;
-
- memcpy(*pder, os->data, os->length);
-
- if (inc)
- *pder += os->length;
- }
-
- return os->length;
- }
+{
+ int inc;
+ ASN1_OCTET_STRING *os = (ASN1_OCTET_STRING *)pkey->pkey.ptr;
+ if (pder) {
+ if (!*pder) {
+ *pder = OPENSSL_malloc(os->length);
+ inc = 0;
+ } else
+ inc = 1;
+
+ memcpy(*pder, os->data, os->length);
+
+ if (inc)
+ *pder += os->length;
+ }
+
+ return os->length;
+}
#endif
-const EVP_PKEY_ASN1_METHOD hmac_asn1_meth =
- {
- EVP_PKEY_HMAC,
- EVP_PKEY_HMAC,
- 0,
+const EVP_PKEY_ASN1_METHOD hmac_asn1_meth = {
+ EVP_PKEY_HMAC,
+ EVP_PKEY_HMAC,
+ 0,
- "HMAC",
- "OpenSSL HMAC method",
+ "HMAC",
+ "OpenSSL HMAC method",
- 0,0,0,0,
+ 0, 0, 0, 0,
- 0,0,0,
+ 0, 0, 0,
- hmac_size,
- 0,
- 0,0,0,0,0,0,0,
+ hmac_size,
+ 0,
+ 0, 0, 0, 0, 0, 0, 0,
- hmac_key_free,
- hmac_pkey_ctrl,
+ hmac_key_free,
+ hmac_pkey_ctrl,
#ifdef HMAC_TEST_PRIVATE_KEY_FORMAT
- old_hmac_decode,
- old_hmac_encode
+ old_hmac_decode,
+ old_hmac_encode
#else
- 0,0
+ 0, 0
#endif
- };
-
+};