2d68bb23d6
Resolves: rhbz#2174429 Apply missing patch Resolves: rhbz#2157602 Enable tests in check phase
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_evp.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_evp.c
|
|
index 2124978..1f853b4 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_evp.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_evp.c
|
|
@@ -44,7 +44,11 @@ int _goboringcrypto_EVP_sign_raw(EVP_MD *md, EVP_PKEY_CTX *ctx, const uint8_t *m
|
|
GO_RSA *rsa_key) {
|
|
int ret = 0;
|
|
GO_EVP_PKEY *pk = _goboringcrypto_EVP_PKEY_new();
|
|
- _goboringcrypto_EVP_PKEY_assign_RSA(pk, rsa_key);
|
|
+ if (!pk)
|
|
+ return 0;
|
|
+
|
|
+ if (!(_goboringcrypto_EVP_PKEY_set1_RSA(pk, rsa_key)))
|
|
+ goto err;
|
|
|
|
if (!ctx && !(ctx = _goboringcrypto_EVP_PKEY_CTX_new(pk, NULL)))
|
|
goto err;
|
|
@@ -64,6 +68,8 @@ int _goboringcrypto_EVP_sign_raw(EVP_MD *md, EVP_PKEY_CTX *ctx, const uint8_t *m
|
|
err:
|
|
if (ctx)
|
|
_goboringcrypto_EVP_PKEY_CTX_free(ctx);
|
|
+ if (pk)
|
|
+ _goboringcrypto_EVP_PKEY_free(pk);
|
|
|
|
return ret;
|
|
}
|
|
@@ -104,7 +110,11 @@ int _goboringcrypto_EVP_verify_raw(const uint8_t *msg, size_t msgLen,
|
|
int ret = 0;
|
|
EVP_PKEY_CTX *ctx;
|
|
GO_EVP_PKEY *pk = _goboringcrypto_EVP_PKEY_new();
|
|
- _goboringcrypto_EVP_PKEY_assign_RSA(pk, rsa_key);
|
|
+ if (!pk)
|
|
+ return 0;
|
|
+
|
|
+ if (!(_goboringcrypto_EVP_PKEY_set1_RSA(pk, rsa_key)))
|
|
+ goto err;
|
|
|
|
if (!(ctx = _goboringcrypto_EVP_PKEY_CTX_new(pk, NULL)))
|
|
goto err;
|
|
@@ -124,6 +134,8 @@ int _goboringcrypto_EVP_verify_raw(const uint8_t *msg, size_t msgLen,
|
|
err:
|
|
if (ctx)
|
|
_goboringcrypto_EVP_PKEY_CTX_free(ctx);
|
|
+ if (pk)
|
|
+ _goboringcrypto_EVP_PKEY_free(pk);
|
|
|
|
return ret;
|
|
}
|