diff options
author | 2005-04-29 05:39:09 +0000 | |
---|---|---|
committer | 2005-04-29 05:39:09 +0000 | |
commit | 40d8aef356a70d0b13395f0805e3044b85d91347 (patch) | |
tree | 22edbfd34c49ce1b7988794a7a74d65829c13819 /lib/libcrypto/dh/dh_err.c | |
parent | import of openssl-0.9.7g; tested on platforms from alpha to zaurus, ok deraadt@ (diff) | |
download | wireguard-openbsd-40d8aef356a70d0b13395f0805e3044b85d91347.tar.xz wireguard-openbsd-40d8aef356a70d0b13395f0805e3044b85d91347.zip |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/dh/dh_err.c')
-rw-r--r-- | lib/libcrypto/dh/dh_err.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libcrypto/dh/dh_err.c b/lib/libcrypto/dh/dh_err.c index d837950aecb..c2715044c91 100644 --- a/lib/libcrypto/dh/dh_err.c +++ b/lib/libcrypto/dh/dh_err.c @@ -1,6 +1,6 @@ /* crypto/dh/dh_err.c */ /* ==================================================================== - * Copyright (c) 1999-2002 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2003 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions |