diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-11-24 19:37:43 +0100 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-11-24 19:37:43 +0100 |
| commit | 4218a944cf36890f6ab89d0bf1bf608be879343e (patch) | |
| tree | 0098afa9f0bba475820faec5e8246db3e367d898 | |
| parent | 3724774d26cdf4c067935ba3df5cb4824c201d84 (diff) | |
| parent | aede7bd47d3178fe434d665c0f836a70e169feeb (diff) | |
| download | ncrypto-4218a944cf36890f6ab89d0bf1bf608be879343e.tar.gz ncrypto-4218a944cf36890f6ab89d0bf1bf608be879343e.tar.xz ncrypto-4218a944cf36890f6ab89d0bf1bf608be879343e.zip | |
Merge branch 'local'
Conflicts:
lib/ncrypto_local.c
| -rw-r--r-- | lib/ncrypto_alg.c | 6 | ||||
| -rw-r--r-- | lib/ncrypto_local.c | 2 | ||||
| -rw-r--r-- | lib/ncrypto_nss.c | 2 |
3 files changed, 0 insertions, 10 deletions
diff --git a/lib/ncrypto_alg.c b/lib/ncrypto_alg.c index 3cfda6a..bc72383 100644 --- a/lib/ncrypto_alg.c +++ b/lib/ncrypto_alg.c @@ -244,8 +244,6 @@ ncr_digest_final (struct ncr_digest_session *sess, void *dest, } *size_ptr = sess->md_size; - g_return_val_if_fail (dest != NULL, CKR_ARGUMENTS_BAD); - res = write (sess->fd, "", 0); if (res != -1) res = read (sess->fd, dest, sess->md_size); @@ -639,8 +637,6 @@ ncr_symm_signature_sign_final (struct ncr_symm_signature_session *sess, } *size_ptr = sess->md_size; - g_return_val_if_fail (dest != NULL, CKR_ARGUMENTS_BAD); - res = write (sess->child_fd, "", 0); if (res != -1) res = read (sess->child_fd, dest, sess->md_size); @@ -1060,7 +1056,6 @@ symm_cipher_update (struct ncr_symm_cipher_session *sess, bool encrypt, return CKR_BUFFER_TOO_SMALL; } - g_return_val_if_fail (dest != NULL, CKR_ARGUMENTS_BAD); g_return_val_if_fail (src != NULL || src_size == 0, CKR_ARGUMENTS_BAD); msg.msg_name = NULL; @@ -1134,7 +1129,6 @@ do_symm_cipher_update_final (struct ncr_symm_cipher_session *sess, return CKR_BUFFER_TOO_SMALL; } - g_return_val_if_fail (dest != NULL, CKR_ARGUMENTS_BAD); g_return_val_if_fail (src != NULL || src_size == 0, CKR_ARGUMENTS_BAD); msg.msg_name = NULL; diff --git a/lib/ncrypto_local.c b/lib/ncrypto_local.c index b06808d..5a138fc 100644 --- a/lib/ncrypto_local.c +++ b/lib/ncrypto_local.c @@ -221,8 +221,6 @@ ncr_symm_key_export (struct ncr_symm_key *key, void *dest, return CKR_BUFFER_TOO_SMALL; } - g_return_val_if_fail (dest != NULL, CKR_ARGUMENTS_BAD); - memcpy (dest, key->value, key->size); *dest_size_ptr = key->size; return CKR_OK; diff --git a/lib/ncrypto_nss.c b/lib/ncrypto_nss.c index 11dc74b..70868a8 100644 --- a/lib/ncrypto_nss.c +++ b/lib/ncrypto_nss.c @@ -520,7 +520,6 @@ ncr_public_key_encrypt (CK_MECHANISM_TYPE mech, struct ncr_public_key *key, } *dest_size_ptr = dest_size; - g_return_val_if_fail (dest != NULL, CKR_ARGUMENTS_BAD); g_return_val_if_fail (src != NULL || src_size == 0, CKR_ARGUMENTS_BAD); switch (mech) @@ -617,7 +616,6 @@ ncr_private_key_sign (CK_MECHANISM_TYPE mech, struct ncr_private_key *key, return CKR_BUFFER_TOO_SMALL; } - g_return_val_if_fail (dest != NULL, CKR_ARGUMENTS_BAD); g_return_val_if_fail (src != NULL || src_size == 0, CKR_ARGUMENTS_BAD); src_item.data = (void *)src; |