2 files changed, 36 insertions, 0 deletions

diff --git a/libbb/bb_getgroups.c b/libbb/bb_getgroups.c
index 5d83c729a..31cff2b41 100644
--- a/libbb/bb_getgroups.c
+++ b/libbb/bb_getgroups.c
@@ -45,3 +45,37 @@ gid_t* FAST_FUNC bb_getgroups(int *ngroups, gid_t *group_array)
                 *ngroups = n;
         return group_array;
 }
+
+uid_t FAST_FUNC get_cached_euid(uid_t *euid)
+{
+        if (*euid == (uid_t)-1)
+                *euid = geteuid();
+        return *euid;
+}
+
+gid_t FAST_FUNC get_cached_egid(gid_t *egid)
+{
+        if (*egid == (gid_t)-1)
+                *egid = getegid();
+        return *egid;
+}
+
+/* Return non-zero if GID is in our supplementary group list. */
+int FAST_FUNC is_in_supplementary_groups(struct cached_groupinfo *groupinfo, gid_t gid)
+{
+        int i;
+        int ngroups;
+        gid_t *group_array;
+
+        if (groupinfo->ngroups == 0)
+                groupinfo->supplementary_array = bb_getgroups(&groupinfo->ngroups, NULL);
+        ngroups = groupinfo->ngroups;
+        group_array = groupinfo->supplementary_array;
+
+        /* Search through the list looking for GID. */
+        for (i = 0; i < ngroups; i++)
+                if (gid == group_array[i])
+                        return 1;
+
+        return 0;
+}
diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index 57a801459..75a61c32c 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -1313,7 +1313,9 @@ unsigned FAST_FUNC sha1_end(sha1_ctx_t *ctx, void *resbuf)
         hash_size = 8;
         if (ctx->process_block == sha1_process_block64
 #if ENABLE_SHA1_HWACCEL
+# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
          || ctx->process_block == sha1_process_block64_shaNI
+# endif
 #endif
         ) {
                 hash_size = 5;