summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/crypto
diff options
context:
space:
mode:
authorZdenek Kotala <Zdenek.Kotala@Sun.COM>2010-07-19 15:59:30 +0200
committerZdenek Kotala <Zdenek.Kotala@Sun.COM>2010-07-19 15:59:30 +0200
commite8ab7b17355c311dfdb9f3aef33d179d9da74433 (patch)
tree13aa915828d8ff360dc20e60ff1b6a16b4ddeca7 /usr/src/uts/common/crypto
parenta3745ee95227dbb143bbd14be46ddfe4ea429d49 (diff)
downloadillumos-joyent-e8ab7b17355c311dfdb9f3aef33d179d9da74433.tar.gz
6948723 Crypto to pkcs11 error mapping has wrong boundary checks
6936557 kernel_get_func_list does not set fl_verify* flags 6949122 return is missing in aes_check_mech_param in aes crypto module
Diffstat (limited to 'usr/src/uts/common/crypto')
-rw-r--r--usr/src/uts/common/crypto/io/aes.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/crypto/io/aes.c b/usr/src/uts/common/crypto/io/aes.c
index 328599e331..2c966064cd 100644
--- a/usr/src/uts/common/crypto/io/aes.c
+++ b/usr/src/uts/common/crypto/io/aes.c
@@ -19,8 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
*/
/*
@@ -301,6 +300,7 @@ aes_check_mech_param(crypto_mechanism_t *mechanism, aes_ctx_t **ctx, int kmflag)
break;
default:
rv = CRYPTO_MECHANISM_INVALID;
+ return (rv);
}
if (param_required && mechanism->cm_param != NULL &&
mechanism->cm_param_len != param_len) {