diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2012-08-29 18:36:25 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2012-08-29 18:36:25 +0000 |
| commit | 01fdd79f235316a79271d1955bc699deca2dcc5d (patch) | |
| tree | 9ddbd648e4c4a2612cb54cc216456861af0102be /usr.sbin/smtpd | |
| parent | a3e4a5ee37847e50b42eae9d8f8d4229d8540844 (diff) | |
switch the default queue encryption to AES-128
I'm committing this on behalf of gilles@
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/parse.y | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.conf.5 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y index 7238a0ccef7..035e4f95242 100644 --- a/usr.sbin/smtpd/parse.y +++ b/usr.sbin/smtpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.94 2012/08/29 16:26:17 gilles Exp $ */ +/* $OpenBSD: parse.y,v 1.95 2012/08/29 18:36:24 naddy Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -326,7 +326,7 @@ encrypt_cipher : CIPHER STRING { $$ = $2; } | /* empty */ { - $$ = "bf-cbc"; + $$ = "aes-128-cbc"; if (EVP_get_cipherbyname($$) == NULL) { yyerror("invalid queue encrypt cipher %s", $$); YYERROR; diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5 index c90cb76c68f..6058352f1d4 100644 --- a/usr.sbin/smtpd/smtpd.conf.5 +++ b/usr.sbin/smtpd/smtpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: smtpd.conf.5,v 1.63 2012/08/29 18:10:28 jmc Exp $ +.\" $OpenBSD: smtpd.conf.5,v 1.64 2012/08/29 18:36:24 naddy Exp $ .\" .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org> .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net> @@ -211,7 +211,7 @@ Envelopes and messages may be inspected using Enable transparent encryption of all envelopes and messages using cipher .Ar algorithm , -by default Blowfish in CBC mode. +by default AES-128 in CBC mode. .Ar key is expanded internally using the .Ar digest |