diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-25 06:11:35 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-25 06:11:35 +0200 |
| commit | c07dc584248074d16c371d2a478bc23520bef69f (patch) | |
| tree | b8c27745b96f425abc9c35667e8e1257969adec7 | |
| parent | f90894ca4a2f56c42b787504e59421b89030c75e (diff) | |
| parent | 6bb729e4da0d4f280845f14196c2e9cef0cd1480 (diff) | |
| download | kernel-crypto-c07dc584248074d16c371d2a478bc23520bef69f.tar.gz kernel-crypto-c07dc584248074d16c371d2a478bc23520bef69f.tar.xz kernel-crypto-c07dc584248074d16c371d2a478bc23520bef69f.zip | |
Merge branch 'bugfixes'
| -rw-r--r-- | ncr-key-wrap.c | 2 | ||||
| -rw-r--r-- | ncr-key.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ncr-key-wrap.c b/ncr-key-wrap.c index 8ca23b8b20f..25bd9e10686 100644 --- a/ncr-key-wrap.c +++ b/ncr-key-wrap.c @@ -496,7 +496,7 @@ cleanup: /* will check if the kek is of equal or higher security level than * wkey. To prevent encrypting a 256 bit key with an 128 bit one. */ -int check_key_level(struct key_item_st* kek, struct key_item_st* wkey) +static int check_key_level(struct key_item_st* kek, struct key_item_st* wkey) { int kek_level, wkey_level; diff --git a/ncr-key.c b/ncr-key.c index a82c907eb5e..ca8ab5f80de 100644 --- a/ncr-key.c +++ b/ncr-key.c @@ -494,7 +494,7 @@ fail: * Keysizes (2009-2010)". It maps the strength of public key algorithms to * symmetric ones. Should be kept up to date. */ -struct { +static const struct { unsigned int bits; /* sec level */ unsigned int rsa_bits; unsigned int dlog_bits; @@ -509,7 +509,7 @@ struct { {0,0,0} }; -unsigned int rsa_to_bits(unsigned int rsa_bits) +static unsigned int rsa_to_bits(unsigned int rsa_bits) { int i = 1; @@ -528,7 +528,7 @@ int i = 1; return ecrypt_vals[i-1].bits; } -unsigned int dlog_to_bits(unsigned int dlog_bits) +static unsigned int dlog_to_bits(unsigned int dlog_bits) { int i = 1; |