[Pkg-freeipa-devel] certmonger: Changes to 'master'

Timo Aaltonen tjaalton at moszumanska.debian.org
Sun Aug 16 08:08:03 UTC 2015


 certmonger.spec  |    7 ++++++-
 configure.ac     |    2 +-
 debian/changelog |    4 ++--
 src/getcert.c    |   14 ++++++++++++++
 src/scep.c       |   18 +++++++++---------
 5 files changed, 32 insertions(+), 13 deletions(-)

New commits:
commit 306f13c5f9f41dfbfb26b3d0734abf52232f7cf5
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Sun Aug 16 11:02:26 2015 +0300

    releasing package certmonger version 0.78.4-1

diff --git a/debian/changelog b/debian/changelog
index ca6b9a0..31d0435 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-certmonger (0.78.4-1) UNRELEASED; urgency=medium
+certmonger (0.78.4-1) unstable; urgency=medium
 
   * New upstream release.
   * control: Add libpopt-dev to build-depends.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Tue, 21 Jul 2015 15:15:53 +0300
+ -- Timo Aaltonen <tjaalton at debian.org>  Sun, 16 Aug 2015 11:02:04 +0300
 
 certmonger (0.75.14-4) unstable; urgency=medium
 

commit cd752bfb06326d2153b252fc53796c6eb20a37fb
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Sun Aug 16 11:01:58 2015 +0300

    update the changelog

diff --git a/debian/changelog b/debian/changelog
index d7d4473..ca6b9a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-certmonger (0.78.3-1) UNRELEASED; urgency=medium
+certmonger (0.78.4-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * control: Add libpopt-dev to build-depends.

commit 6d8d43041605e178b9aff00229aec6abd83f6c1b
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Tue Aug 4 11:15:37 2015 -0400

    tag 0.78.4

diff --git a/certmonger.spec b/certmonger.spec
index 0f91fea..2850554 100644
--- a/certmonger.spec
+++ b/certmonger.spec
@@ -25,7 +25,7 @@
 %endif
 
 Name:		certmonger
-Version:	0.78.3
+Version:	0.78.4
 Release:	1%{?dist}
 Summary:	Certificate status monitor and PKI enrollment client
 
@@ -242,6 +242,11 @@ exit 0
 %endif
 
 %changelog
+* Tue Aug  4 2015 Nalin Dahyabhai <nalin at redhat.com> 0.78.4-1
+- fix the "getcert start-tracking" -L and -l options (#1249753)
+- output diagnostics about the second request when scep-submit encounters an
+  error during a second request to the SCEP server
+
 * Mon Jul 20 2015 Nalin Dahyabhai <nalin at redhat.com> 0.78.3-1
 - call poptGetOptArg() correctly, to fix parsing of the -R flag to scep-submit
   and the -O and -o flags to dogtag-submit (#1244914)
diff --git a/configure.ac b/configure.ac
index cc5dcae..986169b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(certmonger,0.78.3)
+AC_INIT(certmonger,0.78.4)
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 AC_CONFIG_MACRO_DIR(m4)
 AM_MAINTAINER_MODE([enable])

commit a8f847f10f66fc6e0fea45a863827f67132b5fce
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Tue Aug 4 10:58:42 2015 -0400

    Fix "getcert start-tracking"'s -L and -l options
    
    When "getcert start-tracking" was passing changes in enrollment options
    to the "modify" API, it was forgetting to pass in new challenge password
    and challenge password file names.  Add them (#1249753).

diff --git a/src/getcert.c b/src/getcert.c
index c67d618..49840dd 100644
--- a/src/getcert.c
+++ b/src/getcert.c
@@ -2178,6 +2178,20 @@ set_tracking(const char *argv0, const char *category,
 			} else {
 				capath = NULL;
 			}
+			if (cpass != NULL) {
+				param[i].key = CM_DBUS_PROP_TEMPLATE_CHALLENGE_PASSWORD;
+				param[i].value_type = cm_tdbusm_dict_s;
+				param[i].value.s = cpass;
+				params[i] = &param[i];
+				i++;
+			}
+			if (cpassfile != NULL) {
+				param[i].key = CM_DBUS_PROP_TEMPLATE_CHALLENGE_PASSWORD_FILE;
+				param[i].value_type = cm_tdbusm_dict_s;
+				param[i].value.s = cpassfile;
+				params[i] = &param[i];
+				i++;
+			}
 			if (profile != NULL) {
 				param[i].key = CM_DBUS_PROP_TEMPLATE_PROFILE;
 				param[i].value_type = cm_tdbusm_dict_s;

commit fd18c558656c241b806af5c726b873b7fbcad7d3
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Mon Jul 27 13:08:59 2015 -0400

    When we get an error from a pkcsReq, log correctly
    
    When we get an error in response to a pkcsReq or GetInitialCert message,
    log the response text from that request, rather than the capabilities
    request that preceded it.

diff --git a/src/scep.c b/src/scep.c
index c5db5dc..d3bbc05 100644
--- a/src/scep.c
+++ b/src/scep.c
@@ -1031,8 +1031,8 @@ main(int argc, const char **argv)
 						cm_log(1, "%s\n", buf);
 					}
 					s = cm_store_base64_from_bin(ctx,
-								     (unsigned char *) results,
-								     results_length);
+								     (unsigned char *) results2,
+								     results_length2);
 					s = cm_submit_u_pem_from_base64("PKCS7", 0, s);
 					fprintf(stderr, "Full reply:\n%s", s);
 					free(s);
@@ -1046,8 +1046,8 @@ main(int argc, const char **argv)
 						cm_log(1, "%s\n", buf);
 					}
 					s = cm_store_base64_from_bin(ctx,
-								     (unsigned char *) results,
-								     results_length);
+								     (unsigned char *) results2,
+								     results_length2);
 					s = cm_submit_u_pem_from_base64("PKCS7", 0, s);
 					fprintf(stderr, "Full reply:\n%s", s);
 					free(s);
@@ -1061,8 +1061,8 @@ main(int argc, const char **argv)
 						cm_log(1, "%s\n", buf);
 					}
 					s = cm_store_base64_from_bin(ctx,
-								     (unsigned char *) results,
-								     results_length);
+								     (unsigned char *) results2,
+								     results_length2);
 					s = cm_submit_u_pem_from_base64("PKCS7", 0, s);
 					fprintf(stderr, "Full reply:\n%s", s);
 					free(s);
@@ -1079,8 +1079,8 @@ main(int argc, const char **argv)
 						cm_log(1, "%s\n", buf);
 					}
 					s = cm_store_base64_from_bin(ctx,
-								     (unsigned char *) results,
-								     results_length);
+								     (unsigned char *) results2,
+								     results_length2);
 					s = cm_submit_u_pem_from_base64("PKCS7", 0, s);
 					fprintf(stderr, "Full reply:\n%s", s);
 					free(s);
@@ -1100,7 +1100,7 @@ main(int argc, const char **argv)
 		} else {
 			printf(_("Server reply was of unexpected MIME type "
 				 "\"%s\".\n"), content_type);
-			printf("Full reply:\n%.*s", results_length, results);
+			printf("Full reply:\n%.*s", results_length2, results2);
 			return CM_SUBMIT_STATUS_UNREACHABLE;
 		}
 		break;



More information about the Pkg-freeipa-devel mailing list