projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the naming scheme for dispatched functions more consistent
[oweals/openssl.git]
/
providers
/
fips
/
self_test.c
diff --git
a/providers/fips/self_test.c
b/providers/fips/self_test.c
index 5bc921c050ecffcf16202542633fb4f955f1dc5b..d58226f81e482cb524b8d91df6a2a5c893ed0e88 100644
(file)
--- a/
providers/fips/self_test.c
+++ b/
providers/fips/self_test.c
@@
-1,7
+1,7
@@
/*
/*
- * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019
-2020
The OpenSSL Project Authors. All Rights Reserved.
*
*
- * Licensed under the
OpenSSL license
(the "License"). You may not use
+ * Licensed under the
Apache License 2.0
(the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
@@
-92,7
+92,7
@@
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
}
return TRUE;
}
}
return TRUE;
}
-#elif defined(__sun)
+#elif defined(__sun)
|| defined(_AIX)
DEP_DECLARE() /* must be declared before pragma */
# define DEP_INIT_ATTRIBUTE
DEP_DECLARE() /* must be declared before pragma */
# define DEP_INIT_ATTRIBUTE
@@
-130,7
+130,7
@@
DEP_FINI_ATTRIBUTE void cleanup(void)
* the result matches the expected value.
* Return 1 if verified, or 0 if it fails.
*/
* the result matches the expected value.
* Return 1 if verified, or 0 if it fails.
*/
-static int verify_integrity(
BIO *bio, OSSL
_BIO_read_ex_fn read_ex_cb,
+static int verify_integrity(
OSSL_CORE_BIO *bio, OSSL_FUNC
_BIO_read_ex_fn read_ex_cb,
unsigned char *expected, size_t expected_len,
OPENSSL_CTX *libctx, OSSL_SELF_TEST *ev,
const char *event_type)
unsigned char *expected, size_t expected_len,
OPENSSL_CTX *libctx, OSSL_SELF_TEST *ev,
const char *event_type)
@@
-146,7
+146,7
@@
static int verify_integrity(BIO *bio, OSSL_BIO_read_ex_fn read_ex_cb,
OSSL_SELF_TEST_onbegin(ev, event_type, OSSL_SELF_TEST_DESC_INTEGRITY_HMAC);
mac = EVP_MAC_fetch(libctx, MAC_NAME, NULL);
OSSL_SELF_TEST_onbegin(ev, event_type, OSSL_SELF_TEST_DESC_INTEGRITY_HMAC);
mac = EVP_MAC_fetch(libctx, MAC_NAME, NULL);
- ctx = EVP_MAC_
CTX_new
(mac);
+ ctx = EVP_MAC_
new_ctx
(mac);
if (mac == NULL || ctx == NULL)
goto err;
if (mac == NULL || ctx == NULL)
goto err;
@@
-156,7
+156,7
@@
static int verify_integrity(BIO *bio, OSSL_BIO_read_ex_fn read_ex_cb,
sizeof(fixed_key));
*p = OSSL_PARAM_construct_end();
sizeof(fixed_key));
*p = OSSL_PARAM_construct_end();
- if (EVP_MAC_
CTX_set
_params(ctx, params) <= 0
+ if (EVP_MAC_
set_ctx
_params(ctx, params) <= 0
|| !EVP_MAC_init(ctx))
goto err;
|| !EVP_MAC_init(ctx))
goto err;
@@
-177,7
+177,7
@@
static int verify_integrity(BIO *bio, OSSL_BIO_read_ex_fn read_ex_cb,
ret = 1;
err:
OSSL_SELF_TEST_onend(ev, ret);
ret = 1;
err:
OSSL_SELF_TEST_onend(ev, ret);
- EVP_MAC_
CTX_free
(ctx);
+ EVP_MAC_
free_ctx
(ctx);
EVP_MAC_free(mac);
return ret;
}
EVP_MAC_free(mac);
return ret;
}
@@
-188,7
+188,7
@@
int SELF_TEST_post(SELF_TEST_POST_PARAMS *st, int on_demand_test)
int ok = 0;
int kats_already_passed = 0;
long checksum_len;
int ok = 0;
int kats_already_passed = 0;
long checksum_len;
- BIO *bio_module = NULL, *bio_indicator = NULL;
+
OSSL_CORE_
BIO *bio_module = NULL, *bio_indicator = NULL;
unsigned char *module_checksum = NULL;
unsigned char *indicator_checksum = NULL;
int loclstate;
unsigned char *module_checksum = NULL;
unsigned char *indicator_checksum = NULL;
int loclstate;