304 Commits

Author SHA1 Message Date
Eric F Crist
92e227fa00 Merge branch 'TinCanTech-v3.0.6' into v3.0.6
Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-29 16:27:33 -06:00
Richard Bonhomme
418bb30580 Remove unused var 2019-01-29 22:06:16 +00:00
Richard Bonhomme
8ff75ad96b Update op_test.sh usage; Add error count and custom library hook
Signed-off-by: Richard Bonhomme <tincanteksup@gmail.com>
2019-01-29 21:54:19 +00:00
Eric F Crist
3c8c20d159 Merge branch 'v3.0.6' of https://github.com/TinCanTech/easy-rsa into v3.0.6
Add additional tests to op_test.sh

Clsoing #292

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-29 14:31:06 -06:00
Eric F Crist
2543bb2db6 Removing trap left in by mistake
In my test for fixing I left the ERR trap in place.  non-posix, removing

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-29 13:56:13 -06:00
Eric F Crist
e1f8aed886 Fixes #293
die() wasn't calling clean_temp;  Now it is.

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-29 13:32:36 -06:00
Eric F Crist
c93d8066cb Merge branch 'xavierba-renew_fixes' into v3.0.6
Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-28 19:55:12 -06:00
Eric F Crist
044d2220e7 Merge branch 'renew_fixes' of https://github.com/xavierba/easy-rsa into xavierba-renew_fixes 2019-01-28 19:54:46 -06:00
Xavier Bachelot
4ccde23e07 Prevent using an empty SAN
Signed-off-by: Xavier Bachelot <xavier@bachelot.org>
2019-01-28 23:43:06 +01:00
Xavier Bachelot
8b24da13fd Don't try to move inexistant files
Signed-off-by: Xavier Bachelot <xavier@bachelot.org>
2019-01-28 23:42:50 +01:00
Xavier Bachelot
2f841e9fec Workaround older openssl which don't have -ext
Signed-off-by: Xavier Bachelot <xavier@bachelot.org>
2019-01-28 23:42:28 +01:00
Xavier Bachelot
7966cc287a Make cert renew grace period configurable (default: 30 days)
Signed-off-by: Xavier Bachelot <xavier@bachelot.org>
2019-01-28 23:42:01 +01:00
Xavier Bachelot
b904f0c5d3 Fix broken check for cert expiration time in renew command
Signed-off-by: Xavier Bachelot <xavier@bachelot.org>
2019-01-28 23:40:40 +01:00
Richard Bonhomme
348bcab699 Add server renew and tiny lag to verify date field
Signed-off-by: Richard Bonhomme <tincanteksup@gmail.com>
2019-01-28 22:18:39 +00:00
Eric F Crist
6be0b7fc01 Merge branch 'TinCanTech-v3.0.6' into v3.0.6
Add tests for certificate renewal

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-28 16:00:51 -06:00
Richard Bonhomme
d55c4ab83a Add renew_cert() to op_test.sh
Signed-off-by: Richard Bonhomme <tincanteksup@gmail.com>
2019-01-27 18:40:49 +00:00
Eric F Crist
4b3eba59a3 Fix trap() and prog_exit() so it exits correctly
Fixes #282

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-26 16:57:54 -06:00
Richard Bonhomme
6351d321a3 Improve op_test.sh: Fine grain control "show ca/cert"
Signed-off-by: Richard Bonhomme <tincanteksup@gmail.com>
Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-26 15:00:33 -06:00
Eric F Crist
4544691623 Merge branch 'TinCanTech-v3.0.6' into v3.0.6
Effective fix for the bandaid needed in 16c584371641d1a15b73d1be179b0eee132dec3b

My commit (9d6077d91592f43294383de4698c878a039329e9) created an
inadvertent problem for @TinCanTech in his local testing due to some
other latent code.  The bandaid above was to prevent my "fix" from
deleting his test code in future pulls.

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-26 13:11:48 -06:00
Richard Bonhomme
d801b75c98 Improve op_test.sh
New op_test.sh was commited before it was ready:
* Improve TEMP_DIR management (./easyrsa3/temp must not exist)
* Use WORK_DIR (./easyrsa3)
* Clean up CUSTOM_OPTS
* Clean up Sample requests
* Clean up destroy_data (openssl_easyrsa.cnf must be restored)
* Added note to import_req
* Re-instate DEPS_DIR hooks
* Improve output (newline)
* Add required shellcheck exclusions (# shellcheck disable=SC2086 two instances)

Signed-off-by: Richard Bonhomme <tincanteksup@gmail.com>
2019-01-26 18:21:47 +00:00
Richard Bonhomme
699c8780fc gitignore: Remove "temp/*" -- Add "testdeps/*"
Signed-off-by: Richard Bonhomme <tincanteksup@gmail.com>
2019-01-26 17:49:46 +00:00
Eric F Crist
99b126aec3 Update changelog for #286
Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-25 10:51:21 -06:00
Eric F Crist
240c82ac42 Add renew support into EasyRSA
This provides support to renew certificates 30 days before expiration of
the original certificate.

Behavior Change: This adds the ability to create certificates with
duplicate CNs, which differs from previous releases.

Merge branch 'xavierba-renew' into v3.0.6

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-25 10:47:32 -06:00
Eric F Crist
7676e33a6e Merge branch 'renew' of https://github.com/xavierba/easy-rsa into xavierba-renew 2019-01-25 10:46:52 -06:00
Xavier Bachelot
b3750d59ac Hook renew command 2019-01-25 17:39:54 +01:00
Xavier Bachelot
f8bc197408 Allow certificate subject to _not_ be unique 2019-01-25 17:39:54 +01:00
Xavier Bachelot
ccc10e7bea Create dirs to hold certs being renewed 2019-01-25 17:39:54 +01:00
Xavier Bachelot
705e593278 Introduce functions for renewing a certificate 2019-01-25 17:39:54 +01:00
Eric F Crist
4fb23053be Removing local-only code at tincantech's request
Conversation from IRC, times are Central Standard:

09:34:13 <@tincantech> i only added the rm as a "precaution" .. it is not really necessary because all the temp pki's are deleted first anyway
09:34:38 < ecrist> When I look at the code, you have a function, destroy_data() which deletes everything.  It's only called in setup() and in tear_down().
09:35:27 <@tincantech> https://github.com/OpenVPN/easy-rsa/blob/v3.0.6/op_test.sh#L564
09:35:28 < vpnHelper> Title: easy-rsa/op_test.sh at v3.0.6 · OpenVPN/easy-rsa · GitHub (at github.com)
09:37:08 < ecrist> what are you pointing out there?
09:37:44 <@tincantech> i am calling $TEMP_DIR/openssl.sh
09:38:51 < ecrist> and where does that file come from?
09:39:27 <@tincantech> i would prefer that https://github.com/OpenVPN/easy-rsa/blob/v3.0.6/op_test.sh#L215 is just removed completely
09:39:28 < vpnHelper> Title: easy-rsa/op_test.sh at v3.0.6 · OpenVPN/easy-rsa · GitHub (at github.com)
09:42:02 < ecrist> I'm still trying to address the $TEMP_DIR/openssl.sh
09:42:06 < ecrist> where is that file?
09:43:12 <@tincantech> it is only a local file
09:43:36 < ecrist> well, it doesn't make sense to build support in to the test script for things that aren't committed with the test script.
09:44:06 < ecrist> And temp is just that, temp.  If there are other dependencies, those should go in a sane location, like test_libs or something.
09:47:06 <@tincantech> then i guess remove line 564-568

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-25 10:39:03 -06:00
Eric F Crist
e41b58b608 Provide more verbose output during travis runs
Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-25 10:38:50 -06:00
Eric F Crist
74acd2df6e rmdir with the ignore fail on non-empty is a linux thing
Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-25 08:18:23 -06:00
Richard Bonhomme
04888672d4 Improve testing
Limitations, see: https://github.com/OpenVPN/easy-rsa/issues/282

Signed-off-by: Richard Bonhomme <tincanteksup@gmail.com>
Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-25 07:14:29 -06:00
Eric F Crist
1583934bec Update ChangeLog in prep for v3.0.6 release
Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-16 20:17:06 -06:00
Eric F Crist
3e869c0c1c Set shellcheck servity to warning+
Added the -S warning option to the shellcheck call to make informational
and style suggestions not throw errors in travis.  These types of things
can be picked up in code review.

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-16 16:15:47 -06:00
Eric F Crist
51344196ca Add some shellcheck exclusions.
Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-16 16:15:04 -06:00
Eric F Crist
dc85de818e Merge branch 'keros-move_revoked_files' into v3.0.6
Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-16 15:48:31 -06:00
Eric F Crist
7603334b0f Use -n instead of ! -z in test
Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-16 15:46:58 -06:00
Eric F Crist
f39330f6cb Unquote $opt for revoke as it may be empty
In testing for #63 I discovered that there is at least one instance of a
quoted $opts for the revoke command that causes openssl to throw errors.

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-16 15:43:31 -06:00
Eric F Crist
fc804ac1c3 Merge branch 'move_revoked_files' of https://github.com/keros/easy-rsa into keros-move_revoked_files
Minor merge conflict changes:
* remove local scoping
* PR was based on master, this is being merged in v3.0.6

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-16 15:35:03 -06:00
Eric F Crist
5ca20af032 Missed the merge conflict.
Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-11 12:02:52 -06:00
Eric F Crist
7c58e47a69 Support for clientServer
Merging PR #38

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-11 11:58:00 -06:00
Eric F Crist
6ef40c0e39 Scope environment overrides to EASYRSA
Merge branch 'javier-godoy-feature/sed' into v3.0.6

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-11 10:22:08 -06:00
Eric F Crist
998d4f3366 Merge branch 'feature/sed' of https://github.com/javier-godoy/easy-rsa into javier-godoy-feature/sed 2019-01-11 10:21:40 -06:00
Eric F Crist
5961077953 Support for revokation reason.
Merge branch 'javier-godoy-feature/crl_reason' into v3.0.6

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-11 10:13:04 -06:00
Eric F Crist
a11ecd959e Merge branch 'feature/crl_reason' of https://github.com/javier-godoy/easy-rsa into javier-godoy-feature/crl_reason 2019-01-11 10:12:04 -06:00
Eric F Crist
128d5744a2 Merge branch 'TinCanTech-v3.0.6' into v3.0.6
Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-11 09:59:38 -06:00
Richard Bonhomme
54eb9dc8e6 Move verifying the SSL lib to verify_ssl_lib() and only call after verify_pki_init()
Signed-off-by: Richard Bonhomme <25598447+TinCanTech@users.noreply.github.com>
2019-01-04 00:43:08 +00:00
Richard Bonhomme
fb6fd5465a Use EASYRSA specific temp file for output to set_pass
Signed-off-by: Richard Bonhomme <25598447+TinCanTech@users.noreply.github.com>
2019-01-01 18:07:17 +00:00
Javier Godoy
24182ff27e Double quote to prevent globbing and word splitting 2018-12-22 06:05:00 -03:00
Javier Godoy
07641547e4 Add optional CRL reason parameter 2018-12-16 18:18:28 -03:00