4b8542a
diff -up libgcrypt-1.4.4/src/fips.c.use-fipscheck libgcrypt-1.4.4/src/fips.c
e569e43
--- libgcrypt-1.4.4/src/fips.c.use-fipscheck	2009-03-03 21:09:27.000000000 +0100
e569e43
+++ libgcrypt-1.4.4/src/fips.c	2009-03-05 11:20:48.000000000 +0100
4b8542a
@@ -570,23 +570,48 @@ run_random_selftests (void)
4b8542a
   return !!err;
4b8542a
 }
4b8542a
 
4b8542a
+static int
4b8542a
+get_library_path(const char *libname, const char *symbolname, char *path, size_t pathlen)
4b8542a
+{
4b8542a
+    Dl_info info;
4b8542a
+    void *dl, *sym;
4b8542a
+    int rv = -1;
4b8542a
+
4b8542a
+        dl = dlopen(libname, RTLD_LAZY);
4b8542a
+        if (dl == NULL) {
4b8542a
+            return -1;
4b8542a
+        }       
4b8542a
+
4b8542a
+    sym = dlsym(dl, symbolname);
4b8542a
+
4b8542a
+    if (sym != NULL && dladdr(sym, &info)) {
4b8542a
+	strncpy(path, info.dli_fname, pathlen-1);
4b8542a
+	path[pathlen-1] = '\0';
4b8542a
+	rv = 0;
4b8542a
+    }
4b8542a
+
4b8542a
+    dlclose(dl);	
4b8542a
+    
4b8542a
+    return rv;
4b8542a
+}
4b8542a
+
4b8542a
 /* Run an integrity check on the binary.  Returns 0 on success.  */
4b8542a
 static int
4b8542a
 check_binary_integrity (void)
4b8542a
 {
4b8542a
 #ifdef ENABLE_HMAC_BINARY_CHECK
4b8542a
   gpg_error_t err;
4b8542a
-  Dl_info info;
4b8542a
+  char libpath[4096];
4b8542a
   unsigned char digest[32];
4b8542a
   int dlen;
4b8542a
   char *fname = NULL;
4b8542a
-  const char key[] = "What am I, a doctor or a moonshuttle conductor?";
4b8542a
+  const char key[] = "orboDeJITITejsirpADONivirpUkvarP";
4b8542a
   
4b8542a
-  if (!dladdr ("gcry_check_version", &info))
4b8542a
+  if (get_library_path ("libgcrypt.so.11", "gcry_check_version", libpath, sizeof(libpath)))
4b8542a
     err = gpg_error_from_syserror ();
4b8542a
   else
4b8542a
     {
4b8542a
-      dlen = _gcry_hmac256_file (digest, sizeof digest, info.dli_fname,
4b8542a
+      dlen = _gcry_hmac256_file (digest, sizeof digest, libpath,
4b8542a
                                  key, strlen (key));
4b8542a
       if (dlen < 0)
4b8542a
         err = gpg_error_from_syserror ();
4b8542a
@@ -594,7 +619,7 @@ check_binary_integrity (void)
4b8542a
         err = gpg_error (GPG_ERR_INTERNAL);
4b8542a
       else
4b8542a
         {
4b8542a
-          fname = gcry_malloc (strlen (info.dli_fname) + 1 + 5 + 1 );
4b8542a
+          fname = gcry_malloc (strlen (libpath) + 1 + 5 + 1 );
4b8542a
           if (!fname)
4b8542a
             err = gpg_error_from_syserror ();
4b8542a
           else
4b8542a
@@ -603,7 +628,7 @@ check_binary_integrity (void)
4b8542a
               char *p;
4b8542a
 
4b8542a
               /* Prefix the basename with a dot.  */
4b8542a
-              strcpy (fname, info.dli_fname);
4b8542a
+              strcpy (fname, libpath);
4b8542a
               p = strrchr (fname, '/');
4b8542a
               if (p)
4b8542a
                 p++;
fd11f87
diff -up libgcrypt-1.4.4/src/Makefile.in.use-fipscheck libgcrypt-1.4.4/src/Makefile.in
fd11f87
--- libgcrypt-1.4.4/src/Makefile.in.use-fipscheck	2009-01-22 19:16:51.000000000 +0100
fd11f87
+++ libgcrypt-1.4.4/src/Makefile.in	2009-03-05 11:31:57.000000000 +0100
e569e43
@@ -337,7 +337,7 @@ libgcrypt_la_LIBADD = \
e569e43
 	../cipher/libcipher.la \
e569e43
 	../random/librandom.la \
e569e43
 	../mpi/libmpi.la \
fd11f87
-	@LTLIBOBJS@ @GPG_ERROR_LIBS@
fd11f87
+	@LTLIBOBJS@ @GPG_ERROR_LIBS@ -ldl
e569e43
 
e569e43
 dumpsexp_SOURCES = dumpsexp.c
e569e43
 dumpsexp_LDADD =