Thanks, Martin. Update patch attached.

I was getting an 'No newline at the end of file' in my environment hence an
extra '\n' at the end.
Please let me know if you see the same thing.

Thanks,

Gabe

On Wed, Jul 1, 2015 at 2:54 AM, Martin Basti <mba...@redhat.com> wrote:

>  On 01/07/15 09:05, Martin Basti wrote:
>
> On 30/06/15 17:31, Gabe Alford wrote:
>
>  On Tue, Jun 30, 2015 at 8:51 AM, Martin Basti <mba...@redhat.com> wrote:
>
>>   On 16/06/15 16:58, Gabe Alford wrote:
>>
>>  I know you guys are busy. Bump for review.
>>
>>  Thanks,
>>
>>  Gabe
>>
>> On Tue, May 26, 2015 at 8:16 AM, Gabe Alford < <redhatri...@gmail.com>
>> redhatri...@gmail.com> wrote:
>>
>>>   Hello,
>>>
>>>  Fix for https://fedorahosted.org/freeipa/ticket/3809
>>>
>>>  Thanks,
>>>
>>>  Gabe
>>>
>>
>>
>>
>>   I'm getting certificate on server without extra '\n' at the end.
>>
>> So certificate files are not the same.
>>
>
>  I assume you did a diff of the server /etc/ipa/ca.crt and the client
> /etc/ipa/ca.crt, right? Did you setup a server and then connect a client
> (just wonder what your steps were so that I can also reproduce)?
>
>
> Yes. I did that.
>
> I will retest it today.
>
>  Retested and ca.cert on client has extra '\n' at the end.
>
>
>
>>
>> --
>> Martin Basti
>>
>>
>
>
> --
> Martin Basti
>
>
>
>
>
> --
> Martin Basti
>
>
From b63860a9dd8db042f07796ea9fefc13b619b1b8b Mon Sep 17 00:00:00 2001
From: Gabe <redhatri...@gmail.com>
Date: Wed, 8 Jul 2015 08:02:10 -0600
Subject: [PATCH] Fix client ca.crt to match the server's cert

https://fedorahosted.org/freeipa/ticket/3809
---
 ipalib/x509.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipalib/x509.py b/ipalib/x509.py
index edd73ebdc3b3732d326cd8f414bc957f1e4deb87..092d451c66801ff9311e5af4146678dd949d15cc 100644
--- a/ipalib/x509.py
+++ b/ipalib/x509.py
@@ -264,7 +264,7 @@ def make_pem(data):
     Convert a raw base64-encoded blob into something that looks like a PE
     file with lines split to 64 characters and proper headers.
     """
-    pemcert = '\n'.join([data[x:x+64] for x in range(0, len(data), 64)])
+    pemcert = '\r\n'.join([data[x:x+64] for x in range(0, len(data), 64)])
     return '-----BEGIN CERTIFICATE-----\n' + \
     pemcert + \
     '\n-----END CERTIFICATE-----'
-- 
1.8.3.1

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to