diff options
| -rw-r--r-- | usr/src/common/crypto/ecc/ec2_163.c | 12 | ||||
| -rw-r--r-- | usr/src/common/crypto/ecc/ec2_193.c | 14 | ||||
| -rw-r--r-- | usr/src/common/crypto/ecc/ec2_233.c | 16 | ||||
| -rw-r--r-- | usr/src/common/crypto/ecc/ecl_gf.c | 58 | ||||
| -rw-r--r-- | usr/src/common/crypto/ecc/ecp_192.c | 17 | ||||
| -rw-r--r-- | usr/src/common/crypto/ecc/ecp_224.c | 11 | ||||
| -rw-r--r-- | usr/src/common/crypto/ecc/ecp_256.c | 12 | ||||
| -rw-r--r-- | usr/src/lib/pkcs11/libpkcs11/common/metaAttrManager.c | 1 |
8 files changed, 127 insertions, 14 deletions
diff --git a/usr/src/common/crypto/ecc/ec2_163.c b/usr/src/common/crypto/ecc/ec2_163.c index ed45a53f95..cda034208c 100644 --- a/usr/src/common/crypto/ecc/ec2_163.c +++ b/usr/src/common/crypto/ecc/ec2_163.c @@ -44,8 +44,6 @@ * Sun elects to use this software under the MPL license. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "ec2.h" #include "mp_gf2m.h" #include "mp_gf2m-priv.h" @@ -197,15 +195,20 @@ ec_GF2m_163_mul(const mp_int *a, const mp_int *b, mp_int *r, #ifdef ECL_THIRTY_TWO_BIT case 6: a5 = MP_DIGIT(a, 5); + /* FALLTHROUGH */ case 5: a4 = MP_DIGIT(a, 4); + /* FALLTHROUGH */ case 4: a3 = MP_DIGIT(a, 3); #endif + /* FALLTHROUGH */ case 3: a2 = MP_DIGIT(a, 2); + /* FALLTHROUGH */ case 2: a1 = MP_DIGIT(a, 1); + /* FALLTHROUGH */ default: a0 = MP_DIGIT(a, 0); } @@ -213,15 +216,20 @@ ec_GF2m_163_mul(const mp_int *a, const mp_int *b, mp_int *r, #ifdef ECL_THIRTY_TWO_BIT case 6: b5 = MP_DIGIT(b, 5); + /* FALLTHROUGH */ case 5: b4 = MP_DIGIT(b, 4); + /* FALLTHROUGH */ case 4: b3 = MP_DIGIT(b, 3); #endif + /* FALLTHROUGH */ case 3: b2 = MP_DIGIT(b, 2); + /* FALLTHROUGH */ case 2: b1 = MP_DIGIT(b, 1); + /* FALLTHROUGH */ default: b0 = MP_DIGIT(b, 0); } diff --git a/usr/src/common/crypto/ecc/ec2_193.c b/usr/src/common/crypto/ecc/ec2_193.c index d0b2e57399..fad259d636 100644 --- a/usr/src/common/crypto/ecc/ec2_193.c +++ b/usr/src/common/crypto/ecc/ec2_193.c @@ -44,8 +44,6 @@ * Sun elects to use this software under the MPL license. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "ec2.h" #include "mp_gf2m.h" #include "mp_gf2m-priv.h" @@ -206,17 +204,23 @@ ec_GF2m_193_mul(const mp_int *a, const mp_int *b, mp_int *r, #ifdef ECL_THIRTY_TWO_BIT case 7: a6 = MP_DIGIT(a, 6); + /* FALLTHROUGH */ case 6: a5 = MP_DIGIT(a, 5); + /* FALLTHROUGH */ case 5: a4 = MP_DIGIT(a, 4); #endif + /* FALLTHROUGH */ case 4: a3 = MP_DIGIT(a, 3); + /* FALLTHROUGH */ case 3: a2 = MP_DIGIT(a, 2); + /* FALLTHROUGH */ case 2: a1 = MP_DIGIT(a, 1); + /* FALLTHROUGH */ default: a0 = MP_DIGIT(a, 0); } @@ -224,17 +228,23 @@ ec_GF2m_193_mul(const mp_int *a, const mp_int *b, mp_int *r, #ifdef ECL_THIRTY_TWO_BIT case 7: b6 = MP_DIGIT(b, 6); + /* FALLTHROUGH */ case 6: b5 = MP_DIGIT(b, 5); + /* FALLTHROUGH */ case 5: b4 = MP_DIGIT(b, 4); #endif + /* FALLTHROUGH */ case 4: b3 = MP_DIGIT(b, 3); + /* FALLTHROUGH */ case 3: b2 = MP_DIGIT(b, 2); + /* FALLTHROUGH */ case 2: b1 = MP_DIGIT(b, 1); + /* FALLTHROUGH */ default: b0 = MP_DIGIT(b, 0); } diff --git a/usr/src/common/crypto/ecc/ec2_233.c b/usr/src/common/crypto/ecc/ec2_233.c index f7131f8641..5876f0e818 100644 --- a/usr/src/common/crypto/ecc/ec2_233.c +++ b/usr/src/common/crypto/ecc/ec2_233.c @@ -44,8 +44,6 @@ * Sun elects to use this software under the MPL license. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "ec2.h" #include "mp_gf2m.h" #include "mp_gf2m-priv.h" @@ -225,19 +223,26 @@ ec_GF2m_233_mul(const mp_int *a, const mp_int *b, mp_int *r, #ifdef ECL_THIRTY_TWO_BIT case 8: a7 = MP_DIGIT(a, 7); + /* FALLTHROUGH */ case 7: a6 = MP_DIGIT(a, 6); + /* FALLTHROUGH */ case 6: a5 = MP_DIGIT(a, 5); + /* FALLTHROUGH */ case 5: a4 = MP_DIGIT(a, 4); #endif + /* FALLTHROUGH */ case 4: a3 = MP_DIGIT(a, 3); + /* FALLTHROUGH */ case 3: a2 = MP_DIGIT(a, 2); + /* FALLTHROUGH */ case 2: a1 = MP_DIGIT(a, 1); + /* FALLTHROUGH */ default: a0 = MP_DIGIT(a, 0); } @@ -245,19 +250,26 @@ ec_GF2m_233_mul(const mp_int *a, const mp_int *b, mp_int *r, #ifdef ECL_THIRTY_TWO_BIT case 8: b7 = MP_DIGIT(b, 7); + /* FALLTHROUGH */ case 7: b6 = MP_DIGIT(b, 6); + /* FALLTHROUGH */ case 6: b5 = MP_DIGIT(b, 5); + /* FALLTHROUGH */ case 5: b4 = MP_DIGIT(b, 4); #endif + /* FALLTHROUGH */ case 4: b3 = MP_DIGIT(b, 3); + /* FALLTHROUGH */ case 3: b2 = MP_DIGIT(b, 2); + /* FALLTHROUGH */ case 2: b1 = MP_DIGIT(b, 1); + /* FALLTHROUGH */ default: b0 = MP_DIGIT(b, 0); } diff --git a/usr/src/common/crypto/ecc/ecl_gf.c b/usr/src/common/crypto/ecc/ecl_gf.c index 073cf73f77..ab27353e76 100644 --- a/usr/src/common/crypto/ecc/ecl_gf.c +++ b/usr/src/common/crypto/ecc/ecl_gf.c @@ -43,8 +43,6 @@ * Sun elects to use this software under the MPL license. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "mpi.h" #include "mp_gf2m.h" #include "ecl-priv.h" @@ -280,16 +278,20 @@ ec_GFp_add_3(const mp_int *a, const mp_int *b, mp_int *r, switch(MP_USED(a)) { case 3: a2 = MP_DIGIT(a,2); + /* FALLTHROUGH */ case 2: a1 = MP_DIGIT(a,1); + /* FALLTHROUGH */ case 1: a0 = MP_DIGIT(a,0); } switch(MP_USED(b)) { case 3: r2 = MP_DIGIT(b,2); + /* FALLTHROUGH */ case 2: r1 = MP_DIGIT(b,1); + /* FALLTHROUGH */ case 1: r0 = MP_DIGIT(b,0); } @@ -363,20 +365,26 @@ ec_GFp_add_4(const mp_int *a, const mp_int *b, mp_int *r, switch(MP_USED(a)) { case 4: a3 = MP_DIGIT(a,3); + /* FALLTHROUGH */ case 3: a2 = MP_DIGIT(a,2); + /* FALLTHROUGH */ case 2: a1 = MP_DIGIT(a,1); + /* FALLTHROUGH */ case 1: a0 = MP_DIGIT(a,0); } switch(MP_USED(b)) { case 4: r3 = MP_DIGIT(b,3); + /* FALLTHROUGH */ case 3: r2 = MP_DIGIT(b,2); + /* FALLTHROUGH */ case 2: r1 = MP_DIGIT(b,1); + /* FALLTHROUGH */ case 1: r0 = MP_DIGIT(b,0); } @@ -457,24 +465,32 @@ ec_GFp_add_5(const mp_int *a, const mp_int *b, mp_int *r, switch(MP_USED(a)) { case 5: a4 = MP_DIGIT(a,4); + /* FALLTHROUGH */ case 4: a3 = MP_DIGIT(a,3); + /* FALLTHROUGH */ case 3: a2 = MP_DIGIT(a,2); + /* FALLTHROUGH */ case 2: a1 = MP_DIGIT(a,1); + /* FALLTHROUGH */ case 1: a0 = MP_DIGIT(a,0); } switch(MP_USED(b)) { case 5: r4 = MP_DIGIT(b,4); + /* FALLTHROUGH */ case 4: r3 = MP_DIGIT(b,3); + /* FALLTHROUGH */ case 3: r2 = MP_DIGIT(b,2); + /* FALLTHROUGH */ case 2: r1 = MP_DIGIT(b,1); + /* FALLTHROUGH */ case 1: r0 = MP_DIGIT(b,0); } @@ -534,28 +550,38 @@ ec_GFp_add_6(const mp_int *a, const mp_int *b, mp_int *r, switch(MP_USED(a)) { case 6: a5 = MP_DIGIT(a,5); + /* FALLTHROUGH */ case 5: a4 = MP_DIGIT(a,4); + /* FALLTHROUGH */ case 4: a3 = MP_DIGIT(a,3); + /* FALLTHROUGH */ case 3: a2 = MP_DIGIT(a,2); + /* FALLTHROUGH */ case 2: a1 = MP_DIGIT(a,1); + /* FALLTHROUGH */ case 1: a0 = MP_DIGIT(a,0); } switch(MP_USED(b)) { case 6: r5 = MP_DIGIT(b,5); + /* FALLTHROUGH */ case 5: r4 = MP_DIGIT(b,4); + /* FALLTHROUGH */ case 4: r3 = MP_DIGIT(b,3); + /* FALLTHROUGH */ case 3: r2 = MP_DIGIT(b,2); + /* FALLTHROUGH */ case 2: r1 = MP_DIGIT(b,1); + /* FALLTHROUGH */ case 1: r0 = MP_DIGIT(b,0); } @@ -625,16 +651,20 @@ ec_GFp_sub_3(const mp_int *a, const mp_int *b, mp_int *r, switch(MP_USED(a)) { case 3: r2 = MP_DIGIT(a,2); + /* FALLTHROUGH */ case 2: r1 = MP_DIGIT(a,1); + /* FALLTHROUGH */ case 1: r0 = MP_DIGIT(a,0); } switch(MP_USED(b)) { case 3: b2 = MP_DIGIT(b,2); + /* FALLTHROUGH */ case 2: b1 = MP_DIGIT(b,1); + /* FALLTHROUGH */ case 1: b0 = MP_DIGIT(b,0); } @@ -709,20 +739,26 @@ ec_GFp_sub_4(const mp_int *a, const mp_int *b, mp_int *r, switch(MP_USED(a)) { case 4: r3 = MP_DIGIT(a,3); + /* FALLTHROUGH */ case 3: r2 = MP_DIGIT(a,2); + /* FALLTHROUGH */ case 2: r1 = MP_DIGIT(a,1); + /* FALLTHROUGH */ case 1: r0 = MP_DIGIT(a,0); } switch(MP_USED(b)) { case 4: b3 = MP_DIGIT(b,3); + /* FALLTHROUGH */ case 3: b2 = MP_DIGIT(b,2); + /* FALLTHROUGH */ case 2: b1 = MP_DIGIT(b,1); + /* FALLTHROUGH */ case 1: b0 = MP_DIGIT(b,0); } @@ -802,24 +838,32 @@ ec_GFp_sub_5(const mp_int *a, const mp_int *b, mp_int *r, switch(MP_USED(a)) { case 5: r4 = MP_DIGIT(a,4); + /* FALLTHROUGH */ case 4: r3 = MP_DIGIT(a,3); + /* FALLTHROUGH */ case 3: r2 = MP_DIGIT(a,2); + /* FALLTHROUGH */ case 2: r1 = MP_DIGIT(a,1); + /* FALLTHROUGH */ case 1: r0 = MP_DIGIT(a,0); } switch(MP_USED(b)) { case 5: b4 = MP_DIGIT(b,4); + /* FALLTHROUGH */ case 4: b3 = MP_DIGIT(b,3); + /* FALLTHROUGH */ case 3: b2 = MP_DIGIT(b,2); + /* FALLTHROUGH */ case 2: b1 = MP_DIGIT(b,1); + /* FALLTHROUGH */ case 1: b0 = MP_DIGIT(b,0); } @@ -870,28 +914,38 @@ ec_GFp_sub_6(const mp_int *a, const mp_int *b, mp_int *r, switch(MP_USED(a)) { case 6: r5 = MP_DIGIT(a,5); + /* FALLTHROUGH */ case 5: r4 = MP_DIGIT(a,4); + /* FALLTHROUGH */ case 4: r3 = MP_DIGIT(a,3); + /* FALLTHROUGH */ case 3: r2 = MP_DIGIT(a,2); + /* FALLTHROUGH */ case 2: r1 = MP_DIGIT(a,1); + /* FALLTHROUGH */ case 1: r0 = MP_DIGIT(a,0); } switch(MP_USED(b)) { case 6: b5 = MP_DIGIT(b,5); + /* FALLTHROUGH */ case 5: b4 = MP_DIGIT(b,4); + /* FALLTHROUGH */ case 4: b3 = MP_DIGIT(b,3); + /* FALLTHROUGH */ case 3: b2 = MP_DIGIT(b,2); + /* FALLTHROUGH */ case 2: b1 = MP_DIGIT(b,1); + /* FALLTHROUGH */ case 1: b0 = MP_DIGIT(b,0); } diff --git a/usr/src/common/crypto/ecc/ecp_192.c b/usr/src/common/crypto/ecc/ecp_192.c index 41df2037b8..f1c80f304e 100644 --- a/usr/src/common/crypto/ecc/ecp_192.c +++ b/usr/src/common/crypto/ecc/ecp_192.c @@ -42,8 +42,6 @@ * Sun elects to use this software under the MPL license. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "ecp.h" #include "mpi.h" #include "mplogic.h" @@ -96,14 +94,19 @@ ec_GFp_nistp192_mod(const mp_int *a, mp_int *r, const GFMethod *meth) switch (a_used) { case 12: a5b = MP_DIGIT(a, 11); + /* FALLTHROUGH */ case 11: a5a = MP_DIGIT(a, 10); + /* FALLTHROUGH */ case 10: a4b = MP_DIGIT(a, 9); + /* FALLTHROUGH */ case 9: a4a = MP_DIGIT(a, 8); + /* FALLTHROUGH */ case 8: a3b = MP_DIGIT(a, 7); + /* FALLTHROUGH */ case 7: a3a = MP_DIGIT(a, 6); } @@ -186,8 +189,10 @@ ec_GFp_nistp192_mod(const mp_int *a, mp_int *r, const GFMethod *meth) switch (a_used) { case 6: a5 = MP_DIGIT(a, 5); + /* FALLTHROUGH */ case 5: a4 = MP_DIGIT(a, 4); + /* FALLTHROUGH */ case 4: a3 = MP_DIGIT(a, 3); } @@ -308,16 +313,20 @@ ec_GFp_nistp192_add(const mp_int *a, const mp_int *b, mp_int *r, switch(MP_USED(a)) { case 3: a2 = MP_DIGIT(a,2); + /* FALLTHROUGH */ case 2: a1 = MP_DIGIT(a,1); + /* FALLTHROUGH */ case 1: a0 = MP_DIGIT(a,0); } switch(MP_USED(b)) { case 3: r2 = MP_DIGIT(b,2); + /* FALLTHROUGH */ case 2: r1 = MP_DIGIT(b,1); + /* FALLTHROUGH */ case 1: r0 = MP_DIGIT(b,0); } @@ -389,8 +398,10 @@ ec_GFp_nistp192_sub(const mp_int *a, const mp_int *b, mp_int *r, switch(MP_USED(a)) { case 3: r2 = MP_DIGIT(a,2); + /* FALLTHROUGH */ case 2: r1 = MP_DIGIT(a,1); + /* FALLTHROUGH */ case 1: r0 = MP_DIGIT(a,0); } @@ -398,8 +409,10 @@ ec_GFp_nistp192_sub(const mp_int *a, const mp_int *b, mp_int *r, switch(MP_USED(b)) { case 3: b2 = MP_DIGIT(b,2); + /* FALLTHROUGH */ case 2: b1 = MP_DIGIT(b,1); + /* FALLTHROUGH */ case 1: b0 = MP_DIGIT(b,0); } diff --git a/usr/src/common/crypto/ecc/ecp_224.c b/usr/src/common/crypto/ecc/ecp_224.c index 76ae22a2f5..97a6c9bae0 100644 --- a/usr/src/common/crypto/ecc/ecp_224.c +++ b/usr/src/common/crypto/ecc/ecp_224.c @@ -42,8 +42,6 @@ * Sun elects to use this software under the MPL license. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "ecp.h" #include "mpi.h" #include "mplogic.h" @@ -90,16 +88,22 @@ ec_GFp_nistp224_mod(const mp_int *a, mp_int *r, const GFMethod *meth) switch (a_used) { case 14: a6b = MP_DIGIT(a, 13); + /* FALLTHROUGH */ case 13: a6a = MP_DIGIT(a, 12); + /* FALLTHROUGH */ case 12: a5b = MP_DIGIT(a, 11); + /* FALLTHROUGH */ case 11: a5a = MP_DIGIT(a, 10); + /* FALLTHROUGH */ case 10: a4b = MP_DIGIT(a, 9); + /* FALLTHROUGH */ case 9: a4a = MP_DIGIT(a, 8); + /* FALLTHROUGH */ case 8: a3b = MP_DIGIT(a, 7); } @@ -212,6 +216,7 @@ ec_GFp_nistp224_mod(const mp_int *a, mp_int *r, const GFMethod *meth) a6 = MP_DIGIT(a, 6); a6b = a6 >> 32; a6a_a5b = a6 << 32; + /* FALLTHROUGH */ case 6: a5 = MP_DIGIT(a, 5); a5b = a5 >> 32; @@ -219,10 +224,12 @@ ec_GFp_nistp224_mod(const mp_int *a, mp_int *r, const GFMethod *meth) a5b = a5b << 32; a5a_a4b = a5 << 32; a5a = a5 & 0xffffffff; + /* FALLTHROUGH */ case 5: a4 = MP_DIGIT(a, 4); a5a_a4b |= a4 >> 32; a4a_a3b = a4 << 32; + /* FALLTHROUGH */ case 4: a3b = MP_DIGIT(a, 3) >> 32; a4a_a3b |= a3b; diff --git a/usr/src/common/crypto/ecc/ecp_256.c b/usr/src/common/crypto/ecc/ecp_256.c index 9a661f07a2..9a68902fa1 100644 --- a/usr/src/common/crypto/ecc/ecp_256.c +++ b/usr/src/common/crypto/ecc/ecp_256.c @@ -42,8 +42,6 @@ * Sun elects to use this software under the MPL license. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "ecp.h" #include "mpi.h" #include "mplogic.h" @@ -87,18 +85,25 @@ ec_GFp_nistp256_mod(const mp_int *a, mp_int *r, const GFMethod *meth) switch (a_used) { case 16: a15 = MP_DIGIT(a,15); + /* FALLTHROUGH */ case 15: a14 = MP_DIGIT(a,14); + /* FALLTHROUGH */ case 14: a13 = MP_DIGIT(a,13); + /* FALLTHROUGH */ case 13: a12 = MP_DIGIT(a,12); + /* FALLTHROUGH */ case 12: a11 = MP_DIGIT(a,11); + /* FALLTHROUGH */ case 11: a10 = MP_DIGIT(a,10); + /* FALLTHROUGH */ case 10: a9 = MP_DIGIT(a,9); + /* FALLTHROUGH */ case 9: a8 = MP_DIGIT(a,8); } @@ -270,10 +275,13 @@ ec_GFp_nistp256_mod(const mp_int *a, mp_int *r, const GFMethod *meth) switch (a_used) { case 8: a7 = MP_DIGIT(a,7); + /* FALLTHROUGH */ case 7: a6 = MP_DIGIT(a,6); + /* FALLTHROUGH */ case 6: a5 = MP_DIGIT(a,5); + /* FALLTHROUGH */ case 5: a4 = MP_DIGIT(a,4); } diff --git a/usr/src/lib/pkcs11/libpkcs11/common/metaAttrManager.c b/usr/src/lib/pkcs11/libpkcs11/common/metaAttrManager.c index 76fae97a64..d404b567c3 100644 --- a/usr/src/lib/pkcs11/libpkcs11/common/metaAttrManager.c +++ b/usr/src/lib/pkcs11/libpkcs11/common/metaAttrManager.c @@ -136,6 +136,7 @@ get_master_attributes_by_template( case CKO_DATA: /* CKO_DATA has no subtype, just pretend it is found */ found = B_TRUE; + break; default: /* unknown object class */ return (CKR_ATTRIBUTE_VALUE_INVALID); |
