=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/certhash.c,v retrieving revision 1.2 retrieving revision 1.3 diff -c -r1.2 -r1.3 *** src/usr.bin/openssl/certhash.c 2015/02/12 03:09:22 1.2 --- src/usr.bin/openssl/certhash.c 2015/02/12 04:26:46 1.3 *************** *** 121,127 **** rv = hia->hash - hib->hash; if (rv != 0) return (rv); ! rv = bcmp(hia->fingerprint, hib->fingerprint, sizeof(hia->fingerprint)); if (rv != 0) return (rv); return strcmp(hia->filename, hib->filename); --- 121,128 ---- rv = hia->hash - hib->hash; if (rv != 0) return (rv); ! rv = memcmp(hia->fingerprint, hib->fingerprint, ! sizeof(hia->fingerprint)); if (rv != 0) return (rv); return strcmp(hia->filename, hib->filename); *************** *** 404,410 **** for (entry = head; entry != NULL; entry = entry->next) { if (last != NULL) { if (entry->hash == last->hash) { ! if (bcmp(entry->fingerprint, last->fingerprint, sizeof(entry->fingerprint)) == 0) { fprintf(stderr, "WARNING: duplicate %s " "in %s (using %s), ignoring...\n", --- 405,412 ---- for (entry = head; entry != NULL; entry = entry->next) { if (last != NULL) { if (entry->hash == last->hash) { ! if (memcmp(entry->fingerprint, ! last->fingerprint, sizeof(entry->fingerprint)) == 0) { fprintf(stderr, "WARNING: duplicate %s " "in %s (using %s), ignoring...\n",