diff options
author | Yi Zhao <yi.zhao@eng.windriver.com> | 2025-03-27 21:23:24 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2025-04-13 14:07:57 -0400 |
commit | 2c9feba8103662daa648c6b5a8ad0b8f4107ab03 (patch) | |
tree | 739b5e60bd53fc4cf0eb97c42c814f322c94e16d | |
parent | b9d0a654048c7bdd8543ff4db66768426ff4387b (diff) | |
download | meta-security-2c9feba8103662daa648c6b5a8ad0b8f4107ab03.tar.gz |
libgssglue: upgrade 0.8 -> 0.9
* Drop useless patch libgssglue-canon-name.patch
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-security/libgssglue/files/libgssglue-canon-name.patch | 60 | ||||
-rw-r--r-- | recipes-security/libgssglue/libgssglue_0.9.bb (renamed from recipes-security/libgssglue/libgssglue_0.8.bb) | 6 |
2 files changed, 2 insertions, 64 deletions
diff --git a/recipes-security/libgssglue/files/libgssglue-canon-name.patch b/recipes-security/libgssglue/files/libgssglue-canon-name.patch deleted file mode 100644 index cb7c47b..0000000 --- a/recipes-security/libgssglue/files/libgssglue-canon-name.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | fix the bug: | ||
2 | g_canon_name.c:125:5: warning: passing argument 2 of '__gss_copy_namebuf' from incompatible pointer type [enabled by default] | ||
3 | |||
4 | the 2nd argument of __gss_copy_namebuf should be address of *gss_buffer_t, \ | ||
5 | but a *gss_buffer_t is assigned. | ||
6 | |||
7 | what __gss_copy_namebuf does is to alloc memory for a gss_buffer_desc and \ | ||
8 | copy from src and return its address. | ||
9 | |||
10 | if following code failed, gss_release_name will free \ | ||
11 | union_canon_name->external_name.value if it is not NULL. | ||
12 | |||
13 | OM_uint32 __gss_copy_namebuf(src, dest) | ||
14 | gss_buffer_t src; | ||
15 | gss_buffer_t *dest; | ||
16 | |||
17 | typedef struct gss_union_name_t { | ||
18 | gss_mechanism gss_mech; | ||
19 | gss_OID name_type; | ||
20 | gss_buffer_desc external_name; | ||
21 | /* | ||
22 | * These last two fields are only filled in for mechanism | ||
23 | * names. | ||
24 | */ | ||
25 | gss_OID mech_type; | ||
26 | gss_name_t mech_name; | ||
27 | } gss_union_name_desc, *gss_union_name_t; | ||
28 | |||
29 | typedef struct gss_buffer_desc_struct { | ||
30 | size_t length; | ||
31 | void FAR *value; | ||
32 | } gss_buffer_desc, FAR *gss_buffer_t; | ||
33 | |||
34 | Upstream-Status: Pending | ||
35 | Signed-off-by: Yao Zhao <yao.zhao@windriver.com> | ||
36 | |||
37 | --- a/src/g_canon_name.c | ||
38 | +++ b/src/g_canon_name.c | ||
39 | @@ -121,11 +121,17 @@ gss_canonicalize_name (OM_uint32 *minor_ | ||
40 | |||
41 | union_canon_name->mech_name = mech_name; | ||
42 | |||
43 | - status = __gss_copy_namebuf(&union_input_name->external_name, | ||
44 | - &union_canon_name->external_name); | ||
45 | - if (status != GSS_S_COMPLETE) | ||
46 | - goto failure; | ||
47 | + union_canon_name->external_name.value = (void*) malloc( | ||
48 | + union_input_name->external_name.length + 1); | ||
49 | + if (!union_canon_name->external_name.value) | ||
50 | + goto failure; | ||
51 | |||
52 | + memcpy(union_canon_name->external_name.value, | ||
53 | + union_input_name->external_name.value, | ||
54 | + union_input_name->external_name.length); | ||
55 | + union_canon_name->external_name.length = | ||
56 | + union_input_name->external_name.length; | ||
57 | + | ||
58 | if (union_input_name->name_type != GSS_C_NO_OID) { | ||
59 | status = generic_gss_copy_oid(minor_status, | ||
60 | union_input_name->name_type, | ||
diff --git a/recipes-security/libgssglue/libgssglue_0.8.bb b/recipes-security/libgssglue/libgssglue_0.9.bb index e534615..7e24450 100644 --- a/recipes-security/libgssglue/libgssglue_0.8.bb +++ b/recipes-security/libgssglue/libgssglue_0.9.bb | |||
@@ -21,10 +21,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=56871e72a5c475289c0d5e4ba3f2ee3a \ | |||
21 | file://src/oid_ops.c;beginline=378;endline=398;md5=72457a5cdc0354cb5c25c8b150326364\ | 21 | file://src/oid_ops.c;beginline=378;endline=398;md5=72457a5cdc0354cb5c25c8b150326364\ |
22 | " | 22 | " |
23 | 23 | ||
24 | SRC_URI = "git://gitlab.com/gsasl/libgssglue.git;protocol=https;branch=master \ | 24 | SRC_URI = "git://gitlab.com/gsasl/libgssglue.git;protocol=https;branch=master" |
25 | file://libgssglue-canon-name.patch \ | 25 | SRCREV = "ada76bdaec665f70505f0b3aefe871b873e7c4b6" |
26 | " | ||
27 | SRCREV = "c8b4b2936b854a7d4f7ef12e30d6f519b30dec87" | ||
28 | 26 | ||
29 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |
30 | 28 | ||