From: Heiko Hund Date: Fri, 11 Nov 2011 11:11:06 +0100 Message-ID: <6786111.khz1FHIxJB@...1524...> In-Reply-To: <1320074961-3809-9-git-send-email-dejong@...1435...> References: <1320074961-3809-1-git-send-email-dejong@...1435...> <1320074961-3809-9-git-send-email-dejong@...1435...> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="nextPart1826289.xy28apzrLp" Content-Transfer-Encoding: 7Bit Subject: Re: [Openvpn-devel] [PATCH 8/8] Fixed a typo when initialising cryptoapi certs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: openvpn-devel@lists.sourceforge.net --nextPart1826289.xy28apzrLp Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable On Monday 31 October 2011 15:29:21 Adriaan de Jong wrote: > Signed-off-by: Adriaan de Jong > --- > ssl_openssl.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) >=20 > diff --git a/ssl_openssl.c b/ssl_openssl.c > index 391968a..b95944c 100644 > --- a/ssl_openssl.c > +++ b/ssl_openssl.c > @@ -339,7 +339,7 @@ tls_ctx_load_cryptoapi(struct tls_root_ctx *ctx, const > char *cryptoapi_cert) /* Load Certificate and Private Key */ > if (!SSL_CTX_use_CryptoAPI_certificate (ctx->ctx, cryptoapi_cert)) > msg (M_SSLERR, "Cannot load certificate \"%s\" from Microsoft > Certificate Store", - options->cryptoapi_cert); > + cryptoapi_cert); > } > #endif /* WIN32 */ ACK, as this fixes building git master for Windows. --=20 Heiko Hund | Software Engineer | Phone +49-721-25516-237 | Fax -200 Astaro a Sophos Company | Amalienbadstr. 41 Bau 52 | 76227 Karlsruhe | Germ= any Commercial Register: Mannheim HRA 702710 | Headquarter Location: Karlsruhe =20 Represented by the General Partner Astaro Verwaltungs GmbH Amalienbadstra=DFe 41 Bau 52 | 76227 Karlsruhe | Germany=20 Commercial Register: Mannheim HRB 708248 | Executive Board: Gert Hansen, Markus Hennig, Jan Hichert, G=FCnter Junk, Dr. Frank Nellissen --nextPart1826289.xy28apzrLp Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable

On Monday 3= 1 October 2011 15:29:21 Adriaan de Jong wrote:

> Signed= -off-by: Adriaan de Jong <dejong@...1435...>

> ---

> ssl_o= penssl.c | 2 +-

> 1 fil= es changed, 1 insertions(+), 1 deletions(-)

> diff -= -git a/ssl_openssl.c b/ssl_openssl.c

> index = 391968a..b95944c 100644

> --- a/= ssl_openssl.c

> +++ b/= ssl_openssl.c

> @@ -33= 9,7 +339,7 @@ tls_ctx_load_cryptoapi(struct tls_root_ctx *ctx, const

> char *= cryptoapi_cert) /* Load Certificate and Private Key */

> if = (!SSL_CTX_use_CryptoAPI_certificate (ctx->ctx, cryptoapi_cert))

> m= sg (M_SSLERR, "Cannot load certificate \"%s\" from Microsoft=

> Certif= icate Store", - options->cryptoapi_cert);

> + c= ryptoapi_cert);

> }

> #endi= f /* WIN32 */

&nb= sp;

ACK, as thi= s fixes building git master for Windows.

Heiko Hund = | Software Engineer | Phone +49-721-25516-237 | Fax -200

Astaro a So= phos Company | Amalienbadstr. 41 Bau 52 | 76227 Karlsruhe | Germany

Commercial = Register: Mannheim HRA 702710 | Headquarter Location: Karlsruhe

Represented= by the General Partner Astaro Verwaltungs GmbH

Amalienbads= tra=DFe 41 Bau 52 | 76227 Karlsruhe | Germany

Commercial = Register: Mannheim HRB 708248 | Executive Board: Gert Hansen,

Markus Henn= ig, Jan Hichert, G=FCnter Junk, Dr. Frank Nellissen

&nb= sp;

= --nextPart1826289.xy28apzrLp--