aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/agent/snmpa_usm.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2013-10-21 14:32:20 +0200
committerMicael Karlberg <[email protected]>2013-10-21 14:32:20 +0200
commitdc6f086a0751677da8724df397a062ab154f34cb (patch)
tree8ab41ccb19ebb0f2214da76acca5e47a5931f92f /lib/snmp/src/agent/snmpa_usm.erl
parent7d2a1248d82027b5b0e91f4f7c2cdfa5814a3590 (diff)
parent300803837926d0bb28829f313fad07f757188d41 (diff)
downloadotp-dc6f086a0751677da8724df397a062ab154f34cb.tar.gz
otp-dc6f086a0751677da8724df397a062ab154f34cb.tar.bz2
otp-dc6f086a0751677da8724df397a062ab154f34cb.zip
Merge branch 'bmk/snmp/aes_encryption_fixes/OTP-11412' into bmk/snmp/snmp425_integration
Conflicts: lib/snmp/doc/src/notes.xml
Diffstat (limited to 'lib/snmp/src/agent/snmpa_usm.erl')
-rw-r--r--lib/snmp/src/agent/snmpa_usm.erl10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/snmp/src/agent/snmpa_usm.erl b/lib/snmp/src/agent/snmpa_usm.erl
index 6f54307f9f..719ea4e356 100644
--- a/lib/snmp/src/agent/snmpa_usm.erl
+++ b/lib/snmp/src/agent/snmpa_usm.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -16,6 +16,9 @@
%%
%% %CopyrightEnd%
%%
+%% AES: RFC 3826
+%%
+
-module(snmpa_usm).
%% Avoid warning for local function error/1 clashing with autoimported BIF.
@@ -652,7 +655,10 @@ get_des_salt() ->
[?i32(EngineBoots), ?i32(SaltInt)].
aes_encrypt(PrivKey, Data) ->
- snmp_usm:aes_encrypt(PrivKey, Data, fun get_aes_salt/0).
+ EngineBoots = snmp_framework_mib:get_engine_boots(),
+ EngineTime = snmp_framework_mib:get_engine_time(),
+ snmp_usm:aes_encrypt(PrivKey, Data, fun get_aes_salt/0,
+ EngineBoots, EngineTime).
aes_decrypt(PrivKey, UsmSecParams, EncData) ->
#usmSecurityParameters{msgPrivacyParameters = PrivParams,