Restore the x509_hash_name_alpgorithm_change patch.

openssl/crypto/x509/by_dir.c

 /* crypto/x509/by_dir.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 269 matching lines @@
                         X509_CINF st_x509_cinf;
                         } x509;
                 struct  {
                         X509_CRL st_crl;
                         X509_CRL_INFO st_crl_info;
                         } crl;
                 } data;
         int ok=0;
         int i,j,k;
         unsigned long h;
+        unsigned long hash_array[2];
+        int hash_index;
         BUF_MEM *b=NULL;
         X509_OBJECT stmp,*tmp;
         const char *postfix="";
 
         if (name == NULL) return(0);
 
         stmp.type=type;
         if (type == X509_LU_X509)
                 {
                 data.x509.st_x509.cert_info= &data.x509.st_x509_cinf;
@@ skipping 16 matching lines @@
 
         if ((b=BUF_MEM_new()) == NULL)
                 {
                 X509err(X509_F_GET_CERT_BY_SUBJECT,ERR_R_BUF_LIB);
                 goto finish;
                 }
         
         ctx=(BY_DIR *)xl->method_data;
 
         h=X509_NAME_hash(name);
+        hash_array[0]=h;

[Ryan Sleevi, 2013/03/21 19:56:01]

Why structured like this?

Why not
hash_array[0]=X509_NAME_hash(name);

since you assign h on line 332

[digit1, 2013/03/21 21:23:31]

That's not my code :-) I'll try to fix it nonetheless.

+        hash_array[1]=X509_NAME_hash_old(name);
+        for (hash_index=0; hash_index < 2; hash_index++)

[Ryan Sleevi, 2013/03/21 19:56:01]

++hash_index

[wtc, 2013/03/21 22:41:49]

Our C++ Style Guide only recommends using the
pre-increment operator on iterators.

In C code it is common to post-increment for loop index
variables, which seems to be the local preference in this
file (see line 333).

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Preincrement_a...

[agl, 2013/03/22 13:52:36]

Long ago, post incrementing STL iterators was less efficient and so a style
guide clause was born:

"Use prefix form (++i) of the increment and decrement operators with iterators
and other template objects."

It only ever applied to iterators and the like, and it's long been the case that
C++ compilers will generate exactly the same code for both i++ and ++i, even
then.

This aspect of the style guide is now an anachronism.

+                {
+                h=hash_array[hash_index];
         for (i=0; i < sk_BY_DIR_ENTRY_num(ctx->dirs); i++)
                 {
                 BY_DIR_ENTRY *ent;
                 int idx;
                 BY_DIR_HASH htmp, *hent;
                 ent = sk_BY_DIR_ENTRY_value(ctx->dirs, i);
                 j=strlen(ent->dir)+1+8+6+1+1;
                 if (!BUF_MEM_grow(b,j))
                         {
                         X509err(X509_F_GET_CERT_BY_SUBJECT,ERR_R_MALLOC_FAILURE);
@@ skipping 133 matching lines @@
                         ret->type=tmp->type;
                         memcpy(&ret->data,&tmp->data,sizeof(ret->data));
                         /* If we were going to up the reference count,
                          * we would need to do it on a perl 'type'
                          * basis */
         /*              CRYPTO_add(&tmp->data.x509->references,1,
                                 CRYPTO_LOCK_X509);*/
                         goto finish;
                         }
                 }
+                }
 finish:
         if (b != NULL) BUF_MEM_free(b);
         return(ok);
         }