diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2016-10-01 14:18:49 -0700 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2016-10-01 14:18:49 -0700 |
| commit | b65e78ec015a308c1798e602c94502327cc90cd9 (patch) | |
| tree | 4185dc52bcba0af1f815b88e100cd68a626916ca /Cryptlib/OpenSSL/crypto/dso | |
| parent | 21ebe03556d7030055644f46efd3c165396a7a75 (diff) | |
| parent | 86b44a70f0e22233427cef3e966869e59b5e9dd5 (diff) | |
| download | efi-boot-shim-b65e78ec015a308c1798e602c94502327cc90cd9.tar.gz efi-boot-shim-b65e78ec015a308c1798e602c94502327cc90cd9.zip | |
Resync with Ubuntu, including patch to fix debian/copyright.
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/dso')
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/dso/dso_dl.c | 2 | ||||
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/dso/dso_dlfcn.c | 2 | ||||
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/dso/dso_lib.c | 3 | ||||
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/dso/dso_vms.c | 2 | ||||
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/dso/dso_win32.c | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/Cryptlib/OpenSSL/crypto/dso/dso_dl.c b/Cryptlib/OpenSSL/crypto/dso/dso_dl.c index 0087ac54..ceedf66e 100644 --- a/Cryptlib/OpenSSL/crypto/dso/dso_dl.c +++ b/Cryptlib/OpenSSL/crypto/dso/dso_dl.c @@ -1,4 +1,4 @@ -/* dso_dl.c -*- mode:C; c-file-style: "eay" -*- */ +/* dso_dl.c */ /* * Written by Richard Levitte (richard@levitte.org) for the OpenSSL project * 2000. diff --git a/Cryptlib/OpenSSL/crypto/dso/dso_dlfcn.c b/Cryptlib/OpenSSL/crypto/dso/dso_dlfcn.c index f629f038..78df723f 100644 --- a/Cryptlib/OpenSSL/crypto/dso/dso_dlfcn.c +++ b/Cryptlib/OpenSSL/crypto/dso/dso_dlfcn.c @@ -1,4 +1,4 @@ -/* dso_dlfcn.c -*- mode:C; c-file-style: "eay" -*- */ +/* dso_dlfcn.c */ /* * Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL project * 2000. diff --git a/Cryptlib/OpenSSL/crypto/dso/dso_lib.c b/Cryptlib/OpenSSL/crypto/dso/dso_lib.c index 09b8eafc..2beb7c1b 100644 --- a/Cryptlib/OpenSSL/crypto/dso/dso_lib.c +++ b/Cryptlib/OpenSSL/crypto/dso/dso_lib.c @@ -1,4 +1,4 @@ -/* dso_lib.c -*- mode:C; c-file-style: "eay" -*- */ +/* dso_lib.c */ /* * Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL project * 2000. @@ -122,6 +122,7 @@ DSO *DSO_new_method(DSO_METHOD *meth) ret->meth = meth; ret->references = 1; if ((ret->meth->init != NULL) && !ret->meth->init(ret)) { + sk_void_free(ret->meth_data); OPENSSL_free(ret); ret = NULL; } diff --git a/Cryptlib/OpenSSL/crypto/dso/dso_vms.c b/Cryptlib/OpenSSL/crypto/dso/dso_vms.c index d0794b8f..1efd84b9 100644 --- a/Cryptlib/OpenSSL/crypto/dso/dso_vms.c +++ b/Cryptlib/OpenSSL/crypto/dso/dso_vms.c @@ -1,4 +1,4 @@ -/* dso_vms.c -*- mode:C; c-file-style: "eay" -*- */ +/* dso_vms.c */ /* * Written by Richard Levitte (richard@levitte.org) for the OpenSSL project * 2000. diff --git a/Cryptlib/OpenSSL/crypto/dso/dso_win32.c b/Cryptlib/OpenSSL/crypto/dso/dso_win32.c index c65234e9..706e754a 100644 --- a/Cryptlib/OpenSSL/crypto/dso/dso_win32.c +++ b/Cryptlib/OpenSSL/crypto/dso/dso_win32.c @@ -1,4 +1,4 @@ -/* dso_win32.c -*- mode:C; c-file-style: "eay" -*- */ +/* dso_win32.c */ /* * Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL project * 2000. |