| 1 |
arfrever 09/05/02 18:30:04 |
| 2 |
|
| 3 |
Added: ecryptfs-utils-75-fix_warnings.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
(Portage version: 13595-svn/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-fs/ecryptfs-utils/files/ecryptfs-utils-75-fix_warnings.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/ecryptfs-utils/files/ecryptfs-utils-75-fix_warnings.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/ecryptfs-utils/files/ecryptfs-utils-75-fix_warnings.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: ecryptfs-utils-75-fix_warnings.patch |
| 15 |
=================================================================== |
| 16 |
--- src/key_mod/ecryptfs_key_mod_gpg.c |
| 17 |
+++ src/key_mod/ecryptfs_key_mod_gpg.c |
| 18 |
@@ -131,7 +131,7 @@ |
| 19 |
|
| 20 |
int ecryptfs_gpg_encrypt(char *to, int size, char *from, unsigned char *blob) |
| 21 |
{ |
| 22 |
- int rc; |
| 23 |
+ int rc = 0; |
| 24 |
|
| 25 |
/* gpg_op_encrypt(...); */ |
| 26 |
out: |
| 27 |
@@ -251,7 +251,7 @@ |
| 28 |
struct val_node **head, void **foo) |
| 29 |
{ |
| 30 |
struct key_mod_gpg *key_mod_gpg = (struct key_mod_gpg *)(*foo); |
| 31 |
- int i; |
| 32 |
+ int i = 0; |
| 33 |
gpgme_error_t err; |
| 34 |
int rc = 0; |
| 35 |
gpgme_key_t key; |
| 36 |
@@ -283,10 +283,7 @@ |
| 37 |
|
| 38 |
static int generate_name_val_list(struct ecryptfs_name_val_pair *head) |
| 39 |
{ |
| 40 |
- struct stat buf; |
| 41 |
- int i = 0; |
| 42 |
uid_t id = getuid(); |
| 43 |
- struct passwd *pw = getpwuid(id); |
| 44 |
int rc = 0; |
| 45 |
|
| 46 |
head->next = NULL; |
| 47 |
@@ -304,6 +301,7 @@ |
| 48 |
destroy_key_mod_gpg(key_mod_gpg); |
| 49 |
free(key_mod_gpg); |
| 50 |
} |
| 51 |
+ return 0; |
| 52 |
} |
| 53 |
|
| 54 |
|
| 55 |
@@ -312,7 +310,6 @@ |
| 56 |
{ |
| 57 |
struct key_mod_gpg *key_mod_gpg; |
| 58 |
gpgme_error_t err; |
| 59 |
- gpgme_keylist_result_t keylist_res; |
| 60 |
int rc = 0; |
| 61 |
|
| 62 |
(*foo) = NULL; |
| 63 |
@@ -329,7 +326,7 @@ |
| 64 |
if ((err = gpgme_op_keylist_start(key_mod_gpg->ctx, "", 0))) { |
| 65 |
printf("Error attempting to start keylist\n"); |
| 66 |
rc = -EINVAL; |
| 67 |
- gpgme_release(ctx); |
| 68 |
+ gpgme_release(key_mod_gpg->ctx); |
| 69 |
free(key_mod_gpg); |
| 70 |
goto out; |
| 71 |
} |
| 72 |
--- src/key_mod/ecryptfs_key_mod_pkcs11_helper.c |
| 73 |
+++ src/key_mod/ecryptfs_key_mod_pkcs11_helper.c |
| 74 |
@@ -592,7 +592,6 @@ |
| 75 |
char dn[1024] = {0}; |
| 76 |
char serial[1024] = {0}; |
| 77 |
char *ser = NULL; |
| 78 |
- char *ssh_key = NULL; |
| 79 |
size_t ser_len = 0; |
| 80 |
int n; |
| 81 |
|
| 82 |
@@ -1538,7 +1537,6 @@ |
| 83 |
struct ecryptfs_ctx *ctx = &_ctx; |
| 84 |
struct ecryptfs_name_val_pair nvp_head; |
| 85 |
struct val_node *dummy_mnt_params; |
| 86 |
- uid_t id; |
| 87 |
struct passwd *pw; |
| 88 |
char *rcfile_fullpath = NULL; |
| 89 |
int fd; |
| 90 |
@@ -1649,6 +1647,7 @@ |
| 91 |
if (pkcs11h_key_param_nodes[PKCS11H_KEY_TOK_ID].suggested_val) |
| 92 |
free(pkcs11h_key_param_nodes[PKCS11H_KEY_TOK_ID].suggested_val); |
| 93 |
pkcs11h_terminate (); |
| 94 |
+ return 0; |
| 95 |
} |
| 96 |
|
| 97 |
static struct ecryptfs_key_mod_ops ecryptfs_pkcs11h_ops = { |
| 98 |
--- src/libecryptfs/key_management.c |
| 99 |
+++ src/libecryptfs/key_management.c |
| 100 |
@@ -18,6 +18,7 @@ |
| 101 |
* 02111-1307, USA. |
| 102 |
*/ |
| 103 |
|
| 104 |
+#include "config.h" |
| 105 |
#include <errno.h> |
| 106 |
#ifdef ENABLE_NSS |
| 107 |
#include <nss.h> |
| 108 |
@@ -39,7 +40,6 @@ |
| 109 |
#include <sys/types.h> |
| 110 |
#include <sys/stat.h> |
| 111 |
#include <pwd.h> |
| 112 |
-#include "config.h" |
| 113 |
#include "../include/ecryptfs.h" |
| 114 |
|
| 115 |
#ifndef ENOKEY |
| 116 |
--- src/utils/ecryptfs_unwrap_passphrase.c |
| 117 |
+++ src/utils/ecryptfs_unwrap_passphrase.c |
| 118 |
@@ -42,7 +42,6 @@ |
| 119 |
char *wrapping_passphrase; |
| 120 |
char salt[ECRYPTFS_SALT_SIZE]; |
| 121 |
char salt_hex[ECRYPTFS_SALT_SIZE_HEX]; |
| 122 |
- struct passwd *pwd; |
| 123 |
int rc = 0; |
| 124 |
|
| 125 |
if (argc == 1) { |
Archives