author | Ronald Jordan <ron.jordan@oracle.com> |
Mon, 01 Aug 2016 12:38:38 -0700 | |
branch | s11u3-sru |
changeset 6535 | 8f23248b161c |
permissions | -rw-r--r-- |
6535
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
1 |
Upstream fixes already included in the latest community updates to coolkey v1.1.0 |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
2 |
|
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
3 |
Addresses various buffer management issues in the coolkey library. |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
4 |
|
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
5 |
--- ORIGINAL/./src/libckyapplet/cky_base.c 2016-06-24 16:08:04.062060228 -0400 |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
6 |
+++ ././src/libckyapplet/cky_base.c 2016-06-24 12:46:18.558329391 -0400 |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
7 |
@@ -41,6 +41,7 @@ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
8 |
buf->data = NULL; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
9 |
buf->size = 0; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
10 |
buf->len = 0; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
11 |
+ buf->reserved = NULL; /* make coverity happy */ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
12 |
} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
13 |
|
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
14 |
/* |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
15 |
@@ -220,6 +221,22 @@ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
16 |
return CKYSUCCESS; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
17 |
} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
18 |
|
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
19 |
+/* append a short in network order */ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
20 |
+CKYStatus |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
21 |
+CKYBuffer_AppendShortLE(CKYBuffer *buf, unsigned short val) |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
22 |
+{ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
23 |
+ CKYStatus ret; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
24 |
+ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
25 |
+ ret = CKYBuffer_Reserve(buf, buf->len + 2); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
26 |
+ if (ret != CKYSUCCESS) { |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
27 |
+ return ret; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
28 |
+ } |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
29 |
+ buf->data[buf->len+1] = (CKYByte) ((val >> 8) & 0xff); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
30 |
+ buf->data[buf->len+0] = (CKYByte) ((val >> 0) & 0xff); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
31 |
+ buf->len += 2; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
32 |
+ return CKYSUCCESS; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
33 |
+} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
34 |
+ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
35 |
/* append a long in applet order */ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
36 |
CKYStatus |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
37 |
CKYBuffer_AppendLong(CKYBuffer *buf, unsigned long val) |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
38 |
@@ -238,6 +255,24 @@ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
39 |
return CKYSUCCESS; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
40 |
} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
41 |
|
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
42 |
+/* append a long in applet order */ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
43 |
+CKYStatus |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
44 |
+CKYBuffer_AppendLongLE(CKYBuffer *buf, unsigned long val) |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
45 |
+{ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
46 |
+ CKYStatus ret; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
47 |
+ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
48 |
+ ret = CKYBuffer_Reserve(buf, buf->len + 4); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
49 |
+ if (ret != CKYSUCCESS) { |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
50 |
+ return ret; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
51 |
+ } |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
52 |
+ buf->data[buf->len+3] = (CKYByte) ((val >> 24) & 0xff); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
53 |
+ buf->data[buf->len+2] = (CKYByte) ((val >> 16) & 0xff); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
54 |
+ buf->data[buf->len+1] = (CKYByte) ((val >> 8) & 0xff); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
55 |
+ buf->data[buf->len+0] = (CKYByte) ((val >> 0) & 0xff); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
56 |
+ buf->len += 4; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
57 |
+ return CKYSUCCESS; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
58 |
+} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
59 |
+ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
60 |
CKYStatus |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
61 |
CKYBuffer_Replace(CKYBuffer *buf, CKYOffset offset, const CKYByte *data, CKYSize len) |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
62 |
{ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
63 |
@@ -351,6 +386,22 @@ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
64 |
} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
65 |
|
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
66 |
CKYStatus |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
67 |
+CKYBuffer_SetShortLE(CKYBuffer *buf, CKYOffset offset, unsigned short val) |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
68 |
+{ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
69 |
+ CKYStatus ret; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
70 |
+ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
71 |
+ if (buf->len < offset+2) { |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
72 |
+ ret = CKYBuffer_Resize(buf,offset+2); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
73 |
+ if (ret != CKYSUCCESS) { |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
74 |
+ return ret; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
75 |
+ } |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
76 |
+ } |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
77 |
+ buf->data[offset+1] = (CKYByte) ((val >> 8) & 0xff); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
78 |
+ buf->data[offset+0] = (CKYByte) ((val >> 0) & 0xff); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
79 |
+ return CKYSUCCESS; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
80 |
+} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
81 |
+ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
82 |
+CKYStatus |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
83 |
CKYBuffer_SetLong(CKYBuffer *buf, CKYOffset offset, unsigned long val) |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
84 |
{ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
85 |
CKYStatus ret; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
86 |
@@ -368,6 +419,24 @@ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
87 |
return CKYSUCCESS; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
88 |
} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
89 |
|
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
90 |
+CKYStatus |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
91 |
+CKYBuffer_SetLongLE(CKYBuffer *buf, CKYOffset offset, unsigned long val) |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
92 |
+{ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
93 |
+ CKYStatus ret; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
94 |
+ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
95 |
+ if (buf->len < offset+4) { |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
96 |
+ ret = CKYBuffer_Resize(buf,offset+4); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
97 |
+ if (ret != CKYSUCCESS) { |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
98 |
+ return ret; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
99 |
+ } |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
100 |
+ } |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
101 |
+ buf->data[offset+3] = (CKYByte) ((val >> 24) & 0xff); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
102 |
+ buf->data[offset+2] = (CKYByte) ((val >> 16) & 0xff); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
103 |
+ buf->data[offset+1] = (CKYByte) ((val >> 8) & 0xff); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
104 |
+ buf->data[offset+0] = (CKYByte) ((val >> 0) & 0xff); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
105 |
+ return CKYSUCCESS; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
106 |
+} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
107 |
+ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
108 |
CKYByte |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
109 |
CKYBuffer_GetChar(const CKYBuffer *buf, CKYOffset offset) |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
110 |
{ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
111 |
@@ -388,6 +457,18 @@ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
112 |
val |= ((unsigned short)buf->data[offset+1]) << 0; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
113 |
return val; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
114 |
} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
115 |
+ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
116 |
+unsigned short |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
117 |
+CKYBuffer_GetShortLE(const CKYBuffer *buf, CKYOffset offset) |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
118 |
+{ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
119 |
+ unsigned short val; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
120 |
+ if (buf->len < offset+2) { |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
121 |
+ return 0; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
122 |
+ } |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
123 |
+ val = ((unsigned short)buf->data[offset+1]) << 8; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
124 |
+ val |= ((unsigned short)buf->data[offset+0]) << 0; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
125 |
+ return val; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
126 |
+} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
127 |
|
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
128 |
unsigned long |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
129 |
CKYBuffer_GetLong(const CKYBuffer *buf, CKYOffset offset) |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
130 |
@@ -402,6 +483,20 @@ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
131 |
val |= ((unsigned long)buf->data[offset+3]) << 0; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
132 |
return val; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
133 |
} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
134 |
+ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
135 |
+unsigned long |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
136 |
+CKYBuffer_GetLongLE(const CKYBuffer *buf, CKYOffset offset) |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
137 |
+{ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
138 |
+ unsigned long val; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
139 |
+ if (buf->len < offset+4) { |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
140 |
+ return 0; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
141 |
+ } |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
142 |
+ val = ((unsigned long)buf->data[offset+3]) << 24; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
143 |
+ val |= ((unsigned long)buf->data[offset+2]) << 16; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
144 |
+ val |= ((unsigned long)buf->data[offset+1]) << 8; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
145 |
+ val |= ((unsigned long)buf->data[offset+0]) << 0; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
146 |
+ return val; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
147 |
+} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
148 |
|
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
149 |
CKYStatus |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
150 |
CKYBuffer_Resize(CKYBuffer *buf, CKYSize newLen) |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
151 |
@@ -479,6 +574,7 @@ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
152 |
assert(sizeof(CKYAPDU) == sizeof(CKYAPDUPublic)); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
153 |
#endif |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
154 |
ckyBuffer_initBuffer(&apdu->apduBuf); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
155 |
+ apdu->reserved = NULL; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
156 |
return CKYBuffer_Resize(&apdu->apduBuf, CKYAPDU_MIN_LEN); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
157 |
} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
158 |
|
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
159 |
@@ -489,6 +585,7 @@ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
160 |
assert(sizeof(CKYAPDU) == sizeof(CKYAPDUPublic)); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
161 |
#endif |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
162 |
ckyBuffer_initBuffer(&apdu->apduBuf); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
163 |
+ apdu->reserved = NULL; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
164 |
if (len > CKYAPDU_MAX_DATA_LEN) { |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
165 |
return CKYDATATOOLONG; |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
166 |
} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
167 |
@@ -616,8 +713,15 @@ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
168 |
return CKYBuffer_SetChar(&apdu->apduBuf, CKY_LE_OFFSET, recvlen); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
169 |
} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
170 |
|
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
171 |
+CKYStatus |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
172 |
+CKYAPDU_AppendReceiveLen(CKYAPDU *apdu, CKYByte recvlen) |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
173 |
+{ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
174 |
+ return CKYBuffer_AppendChar(&apdu->apduBuf, recvlen); |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
175 |
+} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
176 |
+ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
177 |
+ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
178 |
void |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
179 |
-CKY_SetName(char *p) |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
180 |
+CKY_SetName(const char *p) |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
181 |
{ |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
182 |
} |
8f23248b161c
22017764 Add Coolkey v1.1.0 to Userland consolidation
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
183 |