diff options
| author | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2015-05-06 09:49:30 -0400 |
|---|---|---|
| committer | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2015-05-06 09:49:30 -0400 |
| commit | 2283f5e85dbc78dd10810cb6ebfa39e61ab6759e (patch) | |
| tree | 88017c6acfa326ebaab2d7a4935534f65a36db9b /Cryptlib/OpenSSL/crypto/ecdsa/ecs_lib.c | |
| parent | 3967dc652453e47ecd5f21a55bb687be15c59e9c (diff) | |
| download | efi-boot-shim-2283f5e85dbc78dd10810cb6ebfa39e61ab6759e.tar.gz efi-boot-shim-2283f5e85dbc78dd10810cb6ebfa39e61ab6759e.zip | |
Unapplying patches to prevent spurious conflicts.
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/ecdsa/ecs_lib.c')
| -rwxr-xr-x | Cryptlib/OpenSSL/crypto/ecdsa/ecs_lib.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Cryptlib/OpenSSL/crypto/ecdsa/ecs_lib.c b/Cryptlib/OpenSSL/crypto/ecdsa/ecs_lib.c index 81082c97..2ebae3aa 100755 --- a/Cryptlib/OpenSSL/crypto/ecdsa/ecs_lib.c +++ b/Cryptlib/OpenSSL/crypto/ecdsa/ecs_lib.c @@ -188,15 +188,8 @@ ECDSA_DATA *ecdsa_check(EC_KEY *key) ecdsa_data = (ECDSA_DATA *)ecdsa_data_new(); if (ecdsa_data == NULL) return NULL; - data = EC_KEY_insert_key_method_data(key, (void *)ecdsa_data, - ecdsa_data_dup, ecdsa_data_free, ecdsa_data_free); - if (data != NULL) - { - /* Another thread raced us to install the key_method - * data and won. */ - ecdsa_data_free(ecdsa_data); - ecdsa_data = (ECDSA_DATA *)data; - } + EC_KEY_insert_key_method_data(key, (void *)ecdsa_data, + ecdsa_data_dup, ecdsa_data_free, ecdsa_data_free); } else ecdsa_data = (ECDSA_DATA *)data; |