diff options
Diffstat (limited to 'crypto/userspace/ncr.c')
-rw-r--r-- | crypto/userspace/ncr.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/crypto/userspace/ncr.c b/crypto/userspace/ncr.c index f1d22bdf787..87faace90a5 100644 --- a/crypto/userspace/ncr.c +++ b/crypto/userspace/ncr.c @@ -1,22 +1,25 @@ /* * New driver for /dev/crypto device (aka CryptoDev) - - * Copyright (c) 2010 Nikos Mavrogiannopoulos <nmav@gnutls.org> * - * This file is part of linux cryptodev. + * Copyright (c) 2010 Katholieke Universiteit Leuven * - * cryptodev is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * Author: Nikos Mavrogiannopoulos <nmav@gnutls.org> * - * cryptodev is distributed in the hope that it will be useful, + * This file is part of linux cryptodev. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <linux/crypto.h> @@ -103,7 +106,7 @@ struct ncr_master_key_st st; dprintk(0, KERN_DEBUG, "Master key was previously initialized.\n"); } - dprintk(0, KERN_INFO, "Intializing master key.\n"); + dprintk(0, KERN_INFO, "Initializing master key.\n"); master_key.type = NCR_KEY_TYPE_SECRET; @@ -156,10 +159,8 @@ ncr_ioctl(struct ncr_lists* lst, struct file *filp, return ncr_master_key_set(arg); case NCRIO_KEY_GENERATE_PAIR: return ncr_key_generate_pair(&lst->key, arg); -#if 0 case NCRIO_KEY_DERIVE: return ncr_key_derive(&lst->key, arg); -#endif default: return -EINVAL; } |