diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-27 07:46:15 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-27 07:46:15 +0200 |
| commit | 9f0a6ce7f41043dad38b272cd6ad165f98827b8b (patch) | |
| tree | 909f5dcc886a1ad32ab0a00bc0455c566e1037c2 /ncr-sessions.c | |
| parent | c07dc584248074d16c371d2a478bc23520bef69f (diff) | |
| parent | 1f30d575e5b413e522d6b3e95d3e348df9e9c69e (diff) | |
| download | cryptodev-linux-9f0a6ce7f41043dad38b272cd6ad165f98827b8b.tar.gz cryptodev-linux-9f0a6ce7f41043dad38b272cd6ad165f98827b8b.tar.xz cryptodev-linux-9f0a6ce7f41043dad38b272cd6ad165f98827b8b.zip | |
Merge remote branch 'origin/newapi'
Conflicts:
examples/ncr.c
examples/pk.c
ncr-key-wrap.c
ncr-key.c
ncr.h
Diffstat (limited to 'ncr-sessions.c')
| -rw-r--r-- | ncr-sessions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ncr-sessions.c b/ncr-sessions.c index aa9026d..0e48865 100644 --- a/ncr-sessions.c +++ b/ncr-sessions.c @@ -429,7 +429,7 @@ static struct session_item_st *_ncr_session_init(struct ncr_lists *lists, /* wrapping keys cannot be used for encryption or decryption */ - if (ns->key->flags & NCR_KEY_FLAG_WRAPPING) { + if (ns->key->flags & NCR_KEY_FLAG_WRAPPING || ns->key->flags & NCR_KEY_FLAG_UNWRAPPING) { err(); ret = -EINVAL; goto fail; @@ -519,7 +519,7 @@ static struct session_item_st *_ncr_session_init(struct ncr_lists *lists, /* wrapping keys cannot be used for anything except wrapping. */ - if (ns->key->flags & NCR_KEY_FLAG_WRAPPING) { + if (ns->key->flags & NCR_KEY_FLAG_WRAPPING || ns->key->flags & NCR_KEY_FLAG_UNWRAPPING) { err(); ret = -EINVAL; goto fail; |