From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 7 Sep 2009 17:57:18 +0000 (+0000)
Subject: PR: 2031
X-Git-Tag: OpenSSL-fips-2_0-rc1~1543
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b5ca7df5aa359875a5b4fe2868eceb93ba39994c;p=oweals%2Fopenssl.git

PR: 2031
Submitted by: steve@openssl.org

Tolerate application/timestamp-response which some servers send out.
---

diff --git a/apps/tsget b/apps/tsget
index 03b3e5c837..da900d98a1 100644
--- a/apps/tsget
+++ b/apps/tsget
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # Written by Zoltan Glozik <zglozik@stones.com>.
 # Copyright (c) 2002 The OpenTSA Project.  All rights reserved.
-$::version = '$Id: tsget,v 1.2 2009/09/02 15:57:24 steve Exp $';
+$::version = '$Id: tsget,v 1.3 2009/09/07 17:57:18 steve Exp $';
 
 use strict;
 use IO::Handle;
@@ -49,7 +49,7 @@ sub create_curl {
     $curl->setopt(CURLOPT_CUSTOMREQUEST, "POST");
     $curl->setopt(CURLOPT_HTTPHEADER,
 		["Content-Type: application/timestamp-query",
-		"Accept: application/timestamp-reply"]);
+		"Accept: application/timestamp-reply,application/timestamp-response"]);
     $curl->setopt(CURLOPT_READFUNCTION, \&read_body);
     $curl->setopt(CURLOPT_HEADERFUNCTION, sub { return length($_[0]); });
 
@@ -102,7 +102,8 @@ sub get_timestamp {
 	$error_string .= " ($::error_buf)" if defined($::error_buf);
     } else {
         my $ct = $curl->getinfo(CURLINFO_CONTENT_TYPE);
-	if (lc($ct) ne "application/timestamp-reply") {
+	if (lc($ct) ne "application/timestamp-reply"
+	    && lc($ct) ne "application/timestamp-response") {
 	    $error_string = "unexpected content type returned: $ct";
         }
     }