diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-11-24 19:35:27 +0100 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-11-24 19:35:27 +0100 |
| commit | aede7bd47d3178fe434d665c0f836a70e169feeb (patch) | |
| tree | 62a8cb7755629f371d16b74e01c9d4495e2527bf | |
| parent | 1116a18a552c849e4fa4e9002f2964656f66cc09 (diff) | |
| download | ncrypto-aede7bd47d3178fe434d665c0f836a70e169feeb.tar.gz ncrypto-aede7bd47d3178fe434d665c0f836a70e169feeb.tar.xz ncrypto-aede7bd47d3178fe434d665c0f836a70e169feeb.zip | |
Drop redundant destination pointer checks
| -rw-r--r-- | lib/ncrypto_local.c | 8 | ||||
| -rw-r--r-- | lib/ncrypto_nss.c | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/lib/ncrypto_local.c b/lib/ncrypto_local.c index 59d74a4..c4af43a 100644 --- a/lib/ncrypto_local.c +++ b/lib/ncrypto_local.c @@ -223,8 +223,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; @@ -389,8 +387,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 = EVP_DigestFinal_ex (&sess->ctx, dest, NULL); sess->state = NDS_FINISHED; return res ? CKR_OK : ckr_openssl (); @@ -619,7 +615,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); if (EVP_CipherUpdate (&sess->ctx, dest, &outl, src, src_size) == 0) @@ -655,7 +650,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); if (EVP_CipherUpdate (&sess->ctx, dest, &outl, src, src_size) == 0) @@ -947,8 +941,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 = HMAC_Final (&sess->ctx, dest, NULL); sess->state = NSSS_FINISHED; return res ? CKR_OK : ckr_openssl (); 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; |