From 726fad2a65f16c200a03969c29cb5c86c2d427db Mon Sep 17 00:00:00 2001 From: Dina K Nimeh Date: Mon, 7 Jun 2010 08:54:25 -0700 Subject: 6875651 move asymmetric crypto to libsoftcrypto 6816864 collect together padding methods used by PKCS#11 6917508 bignum library needs big random number function 6249983 softtoken based RSA/DSA slow on Niagara 6917506 arcfour lint check missing from usr/src/uts/sun4v/Makefile 6917513 move softFipsDSAUtil.c to common/crypto/fips/fips_dsa_util.c 6834849 dsa_sign() produces invalid signature when pkcs11 engine is used via openssl(1) for certain keys --- usr/src/lib/pkcs11/pkcs11_softtoken/common/softDESCrypt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usr/src/lib/pkcs11/pkcs11_softtoken/common/softDESCrypt.c') diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softDESCrypt.c b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softDESCrypt.c index 84f4fd00be..8159e93624 100644 --- a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softDESCrypt.c +++ b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softDESCrypt.c @@ -18,9 +18,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. */ #include @@ -732,7 +732,7 @@ soft_des_decrypt_common(soft_session_t *session_p, CK_BYTE_PTR pEncrypted, * plaintext. */ rv = soft_remove_pkcs7_padding(last_block, - DES_BLOCK_LEN, &rem_len, DES_BLOCK_LEN); + DES_BLOCK_LEN, &rem_len); if (rv == CKR_OK) { if (rem_len != 0) (void) memcpy(out_buf + out_len, -- cgit v1.2.3