diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-03-28 09:50:31 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-03-28 09:50:31 -0400 |
| commit | 91a178635ede7d286b8fd399269cdb159d960bb9 (patch) | |
| tree | b22c4be9efb7aff434e55c2f94b1ed61db565c5f /openssl/crypto/pem/pem_xaux.c | |
| parent | 1fba987eb45619d0b9487a9d671931e9eeedbb53 (diff) | |
| download | vcxsrv-91a178635ede7d286b8fd399269cdb159d960bb9.tar.gz vcxsrv-91a178635ede7d286b8fd399269cdb159d960bb9.tar.bz2 vcxsrv-91a178635ede7d286b8fd399269cdb159d960bb9.zip | |
Update openssl to version openssl-1.0.1m
Diffstat (limited to 'openssl/crypto/pem/pem_xaux.c')
| -rw-r--r-- | openssl/crypto/pem/pem_xaux.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/openssl/crypto/pem/pem_xaux.c b/openssl/crypto/pem/pem_xaux.c index 328f79620..c52343018 100644 --- a/openssl/crypto/pem/pem_xaux.c +++ b/openssl/crypto/pem/pem_xaux.c @@ -1,6 +1,7 @@ /* pem_xaux.c */ -/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL - * project 2001. +/* + * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project + * 2001. */ /* ==================================================================== * Copyright (c) 2001 The OpenSSL Project. All rights reserved. @@ -10,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -65,4 +66,5 @@ #include <openssl/pem.h> IMPLEMENT_PEM_rw(X509_AUX, X509, PEM_STRING_X509_TRUSTED, X509_AUX) -IMPLEMENT_PEM_rw(X509_CERT_PAIR, X509_CERT_PAIR, PEM_STRING_X509_PAIR, X509_CERT_PAIR) +IMPLEMENT_PEM_rw(X509_CERT_PAIR, X509_CERT_PAIR, PEM_STRING_X509_PAIR, + X509_CERT_PAIR) |