Fix typo and make ca get the CA and request fields correct.

diff --git a/apps/ca.c b/apps/ca.c
index e22beda097221b3e80e06ad3012b1bdb725aa6a0..73df13fe8e2a68a6cb30810117f0074d2073a5c2 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1662,7 +1662,7 @@ again2:
                                        }
                                if (j < 0)
                                        {
                                        }
                                if (j < 0)
                                        {

-                                       BIO_printf(bio_err,"The %s field needed to be the same in the\nCA certificate (%s) and the request (%s)\n",cv->name,((str == NULL)?"NULL":(char *)str->data),((str2 == NULL)?"NULL":(char *)str2->data));
+                                       BIO_printf(bio_err,"The %s field needed to be the same in the\nCA certificate (%s) and the request (%s)\n",cv->name,((str2 == NULL)?"NULL":(char *)str2->data),((str == NULL)?"NULL":(char *)str->data));

                                        goto err;
                                        }
                                }
                                        goto err;
                                        }
                                }

diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h
index d1a5ad25029b74285117a7fe82aa9b6d677a11ab..95c8a21568e4dceded7d3796eb4e849c0d39e0d5 100644 (file)
--- a/crypto/objects/objects.h
+++ b/crypto/objects/objects.h
@@ -949,7 +949,7 @@ extern "C" {
 #define NID_ad_ca_issuers              179
 #define OBJ_ad_ca_issuers              OBJ_id_ad,2L
 
 #define NID_ad_ca_issuers              179
 #define OBJ_ad_ca_issuers              OBJ_id_ad,2L
 

-#define SN_OSCP_sign                   "OCSPSigning"
+#define SN_OCSP_sign                   "OCSPSigning"

 #define LN_OCSP_sign                   "OCSP Signing"
 #define NID_OCSP_sign                  180
 #define OBJ_OCSP_sign                  OBJ_id_kp,9L
 #define LN_OCSP_sign                   "OCSP Signing"
 #define NID_OCSP_sign                  180
 #define OBJ_OCSP_sign                  OBJ_id_kp,9L